decidim 0.0.3 → 0.0.4

data/decidim-admin/spec/features/admin_manages_feature_permissions_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "manage a feature's permissions", type: :feature do
+  let(:organization) { create(:organization) }
+  let(:user) { create(:user, :admin, :confirmed, organization: organization) }
+
+  let!(:participatory_process) do
+    create(:participatory_process, :with_steps, organization: organization)
+  end
+
+  let!(:feature) do
+    create(:feature, participatory_process: participatory_process)
+  end
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin.participatory_process_features_path(participatory_process)
+
+    within ".feature-#{feature.id}" do
+      click_link "Permissions"
+    end
+  end
+
+  it "allows setting permissions with json options" do
+    within "form.new_feature_permissions" do
+      within ".foo-permission" do
+        select "Example authorization", from: "feature_permissions_permissions_foo_authorization_handler_name"
+        fill_in "feature_permissions_permissions_foo_options", with: '{ "foo": 123 }'
+      end
+      find("*[type=submit]").click
+    end
+
+    expect(page).to have_content("successfully")
+
+    expect(feature.reload.permissions["foo"]).to(
+      include(
+        "authorization_handler_name" => "decidim/dummy_authorization_handler",
+        "options" => { "foo" => 123 }
+      )
+    )
+  end
+end

data/decidim-admin/spec/features/admin_manages_features_spec.rb

@@ -154,4 +154,42 @@ describe "Admin manages features", type: :feature do
       expect(page).to have_no_content("My feature")
     end
   end
+
+  describe "publish and unpublish a feature" do
+    let!(:feature) do
+      create(:feature, participatory_process: participatory_process, published_at: published_at)
+    end
+
+    let(:published_at) { nil }
+
+    before do
+      visit decidim_admin.participatory_process_features_path(participatory_process)
+    end
+
+    context "when the feature is unpublished" do
+      it "publishes the feature" do
+        within ".feature-#{feature.id}" do
+          click_link "Publish"
+        end
+
+        within ".feature-#{feature.id}" do
+          expect(page).to have_content("Unpublish")
+        end
+      end
+    end
+
+    context "when the feature is published" do
+      let(:published_at) { Time.current }
+
+      it "unpublishes the feature" do
+        within ".feature-#{feature.id}" do
+          click_link "Unpublish"
+        end
+
+        within ".feature-#{feature.id}" do
+          expect(page).to have_content("Publish")
+        end
+      end
+    end
+  end
 end

data/decidim-admin/spec/features/admin_manages_participatory_process_admins_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_admins_examples"
 
 describe "Admin manages participatory process admins", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/admin_manages_participatory_process_attachments_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_attachments_examples"
 
 describe "Admin manages participatory process attachments", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/admin_manages_participatory_process_categories_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_categories_examples"
 
 describe "Admin manages participatory process categories", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/admin_manages_participatory_process_steps_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_steps_examples"
 
 describe "Admin manages participatory process steps", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/admin_manages_participatory_processes_spec.rb

@@ -2,8 +2,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_processes_examples"
 
 describe "Admin manage participatory processes", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/admin_manages_user_groups_spec.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
 
 describe "Admin manage user groups", type: :feature do
   include_context "participatory process admin"
@@ -18,7 +17,6 @@ describe "Admin manage user groups", type: :feature do
     click_button "Verify", match: :first
 
     expect(page).not_to have_selector(".actions button", match: :first)
-    
     expect(page).to have_content("verified successfully")
   end
-end
+end

data/decidim-admin/spec/features/participatory_process_admin_manages_participatory_process_admins_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_admins_examples"
 
 describe "Participatory process admin manages participatory process admins", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/participatory_process_admin_manages_participatory_process_attachments_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_attachments_examples"
 
 describe "Participatory process admin manages participatory process attachments", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/participatory_process_admin_manages_participatory_process_steps_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_steps_examples"
 
 describe "Participatory process admin manages participatory process steps", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/participatory_process_admin_manages_participatory_processes_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_processes_examples"
 
 describe "Participatory process admin manages participatory processes", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/features/process_admin_manages_participatory_process_categories_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/participatory_admin_shared_context"
-require_relative "../shared/manage_process_categories_examples"
 
 describe "Admin manages participatory process categories", type: :feature do
   include_context "participatory process admin"

data/decidim-admin/spec/forms/organization_form_spec.rb

@@ -6,7 +6,11 @@ module Decidim
   module Admin
     describe OrganizationForm do
       let(:name) { "My super organization" }
-      let(:twitter_handler) { "My awesome handler" }
+      let(:twitter_handler) { "My twitter awesome handler" }
+      let(:facebook_handler) { "My facebook awesome handler" }
+      let(:instagram_handler) { "My instagram awesome handler" }
+      let(:youtube_handler) { "My youtube awesome handler" }
+      let(:github_handler) { "My github awesome handler" }
       let(:welcome_text) do
         {
           en: "Welcome",
@@ -35,7 +39,12 @@ module Decidim
             "description_es" => description[:es],
             "description_ca" => description[:ca],
             "homepage_image" => Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg"), "image/jpeg"),
-            "show_statics" => false
+            "show_statics" => false,
+            "twitter_handler" => twitter_handler,
+            "facebook_handler" => facebook_handler,
+            "instagram_handler" => instagram_handler,
+            "youtube_handler" => youtube_handler,
+            "github_handler" => github_handler
           }
         }
       end

data/decidim-admin/spec/models/participatory_process_user_role_spec.rb

@@ -16,6 +16,23 @@ module Decidim
 
         it { is_expected.not_to be_valid }
       end
+
+      context "when a role already exists" do
+        let(:participatory_process_user_role) do
+          build(
+            :participatory_process_user_role,
+            role: existing_role.role,
+            user: existing_role.user,
+            participatory_process: existing_role.participatory_process
+          )
+        end
+
+        let!(:existing_role) do
+          create(:participatory_process_user_role, role: role)
+        end
+
+        it { is_expected.not_to be_valid }
+      end
     end
   end
 end

data/decidim-admin/spec/shared/manage_process_steps_examples.rb

@@ -60,8 +60,9 @@ RSpec.shared_examples "manage process steps examples" do
         es: "Descripción más larga",
         ca: "Descripció més llarga"
       )
-      fill_in :participatory_process_step_start_date, with: 1.months.ago
-      fill_in :participatory_process_step_end_date, with: 2.months.from_now
+
+      fill_in :participatory_process_step_start_date, with: 1.months.ago.to_date
+      fill_in :participatory_process_step_end_date, with: 2.months.from_now.to_date
 
       find("*[type=submit]").click
     end

data/decidim-budgets/app/assets/images/decidim/budgets/icon.svg

@@ -1,4 +1,16 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
-  <path d="M2 0v1h-.75c-.68 0-1.25.57-1.25 1.25v.5c0 .68.44 1.24 1.09 1.41l2.56.66c.14.04.34.29.34.44v.5c0 .14-.11.25-.25.25h-2.5c-.12 0-.21-.04-.25-.06v-.94h-1v1c0 .34.2.63.44.78.23.16.52.22.81.22h.75v1h1v-1h.75c.69 0 1.25-.56 1.25-1.25v-.5c0-.68-.44-1.24-1.09-1.41l-2.56-.66c-.14-.04-.34-.29-.34-.44v-.5c0-.14.11-.25.25-.25h2.5c.11 0 .21.04.25.06v.94h1v-1c0-.34-.2-.63-.44-.78-.23-.16-.52-.22-.81-.22h-.75v-1h-1z"
-  transform="translate(1)" />
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 36 36" style="enable-background:new 0 0 36 36;" xml:space="preserve">
+<g>
+	<path d="M18,36C8.1,36,0,27.9,0,18S8.1,0,18,0s18,8.1,18,18S27.9,36,18,36z M18,2C9.2,2,2,9.2,2,18s7.2,16,16,16s16-7.2,16-16
+		S26.8,2,18,2z"/>
+</g>
+<g>
+	<g>
+		<path d="M17.1,28.3c-5.3,0-9.9-4.4-9.9-9.8c0-5.5,4.9-9.5,9.3-9.5H18v9h9v0.9C27,23.2,22.7,28.3,17.1,28.3z M16,10.7
+			c-4,0.6-6.5,3.7-6.5,7.6c0,4.3,3.6,8,7.7,8c3.9,0,7-3.3,7.6-6.3H16V10.7z"/>
+	</g>
+	<path d="M30,16H20V6h0.6c4.5,0,9.4,4.4,9.4,8.9V16z M22,14h5.5C27,11,24,8.6,22,8V14z"/>
+</g>
+</svg>

data/decidim-budgets/app/assets/javascripts/decidim/budgets/progressFixed.js.es6

@@ -0,0 +1,23 @@
+$(() => {
+  const checkProgressPosition = () => {
+    let progressFix = document.querySelector("[data-progressbox-fixed]"),
+      progressRef = document.querySelector("[data-progress-reference]"),
+      progressVisibleClass = "is-progressbox-visible";
+
+    if (!progressRef) {
+      return;
+    }
+
+    let progressPosition = progressRef.getBoundingClientRect().bottom;
+    if (progressPosition > 0) {
+      progressFix.classList.remove(progressVisibleClass);
+    } else {
+      progressFix.classList.add(progressVisibleClass);
+    }
+  }
+
+  window.addEventListener("scroll", checkProgressPosition);
+
+  window.DecidimBudgets = window.DecidimBudgets || {};
+  window.DecidimBudgets.checkProgressPosition = checkProgressPosition;
+});

data/decidim-budgets/app/assets/javascripts/decidim/budgets/projects.js.es6

@@ -1,3 +1,4 @@
+// = require ./progressFixed
 // = require_self
 
 $(() => {

data/decidim-budgets/app/assets/stylesheets/decidim/budgets/budget/_budget-list.scss

@@ -11,7 +11,7 @@
   }
 }
 .budget-list__data--added{
-  background-color: mix(white, $success, 80%);
+  background-color: tint($success, 80%);
 }
 
 .budget-list__number{

data/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb

@@ -33,7 +33,6 @@ module Decidim
             category: @form.category,
             feature: @form.current_feature,
             title: @form.title,
-            short_description: @form.short_description,
             description: @form.description,
             budget: @form.budget
           )

data/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb

@@ -37,7 +37,6 @@ module Decidim
             scope: form.scope,
             category: form.category,
             title: form.title,
-            short_description: form.short_description,
             description: form.description,
             budget: form.budget
           )

data/decidim-budgets/app/controllers/decidim/budgets/admin/application_controller.rb

@@ -8,6 +8,15 @@ module Decidim
       # Note that it inherits from `Decidim::Features::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Features::BaseController
+        helper_method :projects, :project
+
+        def projects
+          @projects ||= Project.where(feature: current_feature)
+        end
+
+        def project
+          @project ||= projects.find(params[:id])
+        end
       end
     end
   end

data/decidim-budgets/app/controllers/decidim/budgets/admin/attachments_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Decidim
+  module Budgets
+    module Admin
+      # Controller that allows managing all the attachments for a participatory
+      # process.
+      #
+      class AttachmentsController < Admin::ApplicationController
+        include Decidim::Admin::Concerns::HasAttachments
+
+        def after_destroy_path
+          projects_path
+        end
+
+        def attached_to
+          project
+        end
+
+        def project
+          @project ||= projects.find(params[:project_id])
+        end
+
+        def authorization_object
+          project.feature
+        end
+      end
+    end
+  end
+end

data/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb

@@ -9,6 +9,8 @@ module Decidim
       helper_method :project
 
       def create
+        authorize_action! "vote"
+
         AddLineItem.call(current_order, project, current_user) do
           on(:ok) do |order|
             self.current_order = order

data/decidim-budgets/app/controllers/decidim/budgets/orders_controller.rb

@@ -7,6 +7,8 @@ module Decidim
       include NeedsCurrentOrder
 
       def checkout
+        authorize_action! "vote"
+
         Checkout.call(current_order, current_feature) do
           on(:ok) do
             flash[:notice] = I18n.t("orders.checkout.success", scope: "decidim")

data/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb

@@ -8,15 +8,14 @@ module Decidim
         include TranslationsHelper
 
         translatable_attribute :title, String
-        translatable_attribute :short_description, String
         translatable_attribute :description, String
+
         attribute :budget, Integer
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
         attribute :proposal_ids, Array[Integer]
 
         validates :title, translatable_presence: true
-        validates :short_description, translatable_presence: true
         validates :description, translatable_presence: true
         validates :budget, presence: true, numericality: { greater_than: 0 }
 

data/decidim-budgets/app/models/decidim/budgets/project.rb

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::HasFeature
       include Decidim::HasScope
       include Decidim::HasCategory
+      include Decidim::HasAttachments
 
       feature_manifest_name "budgets"
     end