decidim 0.4.4 → 0.5.0

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_context "participatory process administration by admin" do
+shared_context "participatory process administration by admin" do
   let!(:user) do
     create(:user, :admin, :confirmed, organization: organization)
   end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_context "participatory process administration by process admin" do
+shared_context "participatory process administration by process admin" do
   let!(:user) do
     create(:user,
            :process_admin,

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_context "participatory process administration" do
+shared_context "participatory process administration" do
   let(:organization) { create(:organization) }
 
   let!(:participatory_process) { create(:participatory_process, organization: organization) }

data/decidim-api/app/controllers/decidim/api/application_controller.rb

@@ -6,6 +6,14 @@ module Decidim
     class ApplicationController < ::DecidimController
       skip_before_action :verify_authenticity_token
       include NeedsOrganization
+      include NeedsAuthorization
+      include ImpersonateUsers
+
+      # Overwrites `cancancan`'s method to point to the correct ability class,
+      # since the gem expects the ability class to be in the root namespace.
+      def current_ability_klass
+        Decidim::Abilities::BaseAbility
+      end
     end
   end
 end

data/decidim-api/app/controllers/decidim/api/documentation_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     # This controller takes queries from an HTTP endpoint and sends them out to
     # the Schema to be executed, later returning the response as JSON.
     class DocumentationController < Api::ApplicationController
+      skip_authorization_check
+
       layout "decidim/api/documentation"
     end
   end

data/decidim-api/app/controllers/decidim/api/queries_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     # This controller takes queries from an HTTP endpoint and sends them out to
     # the Schema to be executed, later returning the response as JSON.
     class QueriesController < Api::ApplicationController
+      skip_authorization_check
+
       def create
         query_string = params[:query]
         query_variables = ensure_hash(params[:variables])

data/decidim-api/lib/decidim/api/test/type_context.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.shared_context "graphql type" do
+shared_context "graphql type" do
   let!(:current_organization) { create(:organization) }
   let!(:current_user) { create(:user, organization: current_organization) }
   let(:model) { OpenStruct.new({}) }

data/decidim-api/spec/i18n_spec.rb

@@ -2,6 +2,6 @@
 
 require "decidim/dev/test/i18n_shared_examples"
 
-RSpec.describe "I18n sanity" do
+describe "I18n sanity" do
   include_examples "I18n sanity"
 end

data/decidim-api/spec/spec_helper.rb

@@ -7,5 +7,3 @@ ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
 
 require "decidim/dev/test/base_spec_helper"
-
-Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }

data/decidim-budgets/app/assets/stylesheets/decidim/budgets/_budgets.scss

@@ -1 +1 @@
-@import "budget/*";
+@import "budget/*";

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

@@ -40,7 +40,7 @@ module Decidim
         end
 
         def scope
-          @scope ||= process_scope || current_organization.scopes.where(id: decidim_scope_id).first
+          @scope ||= current_organization.scopes.where(id: decidim_scope_id).first || process_scope
         end
 
         def category

data/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -16,9 +16,9 @@
       <%= form.number_field :budget %>
     </div>
 
-    <% if !current_participatory_process.scope %>
+    <% if current_participatory_process.has_subscopes? %>
       <div class="row column" >
-        <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+        <%= form.scopes_select :decidim_scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
       </div>
     <% end %>
 
@@ -36,4 +36,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</div>

data/decidim-budgets/app/views/decidim/budgets/projects/_budget_excess.html.erb

@@ -11,4 +11,4 @@
       <button data-close class="button expanded"><%= t('.ok') %></button>
     </div>
   </div>
-</div>
+</div>

data/decidim-budgets/app/views/decidim/budgets/projects/_filters.html.erb

@@ -12,8 +12,8 @@
     </div>
   </div>
 
-  <% if current_organization.scopes.any? && !current_participatory_process.scope %>
-    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% if current_participatory_process.has_subscopes? %>
+    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(include_root: true) %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/decidim-budgets/app/views/decidim/budgets/projects/_filters_small_view.html.erb

@@ -15,4 +15,4 @@
   <div class="filters">
     <%= render partial: "filters" %>
   </div>
-</div>
+</div>

data/decidim-budgets/app/views/decidim/budgets/projects/_project.html.erb

@@ -6,7 +6,7 @@
           <%= translated_attribute project.title %>
         </h5>
       <% end %>
-      <%= render partial: "decidim/budgets/projects/tags", locals: { project: project } %>
+      <%= render partial: "decidim/shared/tags", locals: { resource: project, tags_class_extra: "tags--project" } %>
     </div>
   </div>
   <% if current_user.present? %>

data/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/feature_announcement" %>
+
 <% if current_user.present? && current_settings.votes_enabled? %>
   <div class="row column">
     <%= render partial: "budget_summary", locals: { include_heading: true } %>

data/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb

@@ -37,7 +37,7 @@
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <%== translated_attribute project.description %>
-      <%= render partial: "tags", locals: { project: project } %>
+      <%= render partial: "decidim/shared/tags", locals: { resource: project, tags_class_extra: "tags--project" } %>
     </div>
     <%= linked_resources_for project, :proposals, "included_proposals" %>
   </div>

data/decidim-budgets/config/i18n-tasks.yml

@@ -6,6 +6,7 @@ ignore_unused:
 - "decidim.features.budgets.actions.*"
 - "activemodel.attributes.project.*"
 - "decidim.resource_links.*"
-
+ignore_missing:
+  - decidim.scopes.global
 search:
   strict: false

data/decidim-budgets/config/locales/ca.yml

@@ -73,6 +73,7 @@ ca:
         filters:
           category: Categoria
           category_prompt: Selecciona una categoria
+          scope_prompt: Seleccioneu un àmbit
           scopes: Àmbits
           search: Cerca
         filters_small_view:
@@ -126,4 +127,4 @@ ca:
         project_proposals: 'Propostes incloses en aquest projecte:'
   index:
     confirmed_orders_count: Nombre de vots
-  total_budget: Pressupost total
+  total_budget: Pressupost total

data/decidim-budgets/config/locales/en.yml

@@ -80,6 +80,7 @@ en:
         filters:
           category: Category
           category_prompt: Select a category
+          scope_prompt: Select a scope
           scopes: Scopes
           search: Search
         filters_small_view:
@@ -114,10 +115,12 @@ en:
         name: Budgets
         settings:
           global:
+            announcement: Announcement
             comments_enabled: Comments enabled
             total_budget: Total budget
             vote_threshold_percent: Vote threshold percent
           step:
+            announcement: Announcement
             comments_blocked: Comments blocked
             show_votes: Show votes
             votes_enabled: Votes enabled

data/decidim-budgets/config/locales/es.yml

@@ -73,6 +73,7 @@ es:
         filters:
           category: Categoría
           category_prompt: Selecciona una categoría
+          scope_prompt: Seleccione un ámbito
           scopes: Ámbitos
           search: Buscar
         filters_small_view:
@@ -126,4 +127,4 @@ es:
         project_proposals: 'Propuestas incluidas en este proyecto:'
   index:
     confirmed_orders_count: Número de votos
-  total_budget: Presupuesto total
+  total_budget: Presupuesto total

data/decidim-budgets/config/locales/eu.yml

@@ -73,6 +73,7 @@ eu:
         filters:
           category: Kategoria
           category_prompt: Aukeratu kategoria bat
+          scope_prompt: Hautatu esparrua
           scopes: Esparruak
           search: Bilatu
         filters_small_view:
@@ -126,4 +127,4 @@ eu:
         project_proposals: 'Proiektu honetan jasotako proposamenak:'
   index:
     confirmed_orders_count: Boto-kopurua
-  total_budget: Guztizko aurrekontua
+  total_budget: Guztizko aurrekontua

data/decidim-budgets/config/locales/fi.yml

@@ -117,4 +117,4 @@ fi:
         success: Äänesi on peruttu onnistuneesti
   index:
     confirmed_orders_count: Tilauksien määrä
-  total_budget: Koko budjetti
+  total_budget: Koko budjetti

data/decidim-budgets/config/locales/fr.yml

@@ -126,4 +126,4 @@ fr:
         project_proposals: 'Propositions incluses dans ce projet:'
   index:
     confirmed_orders_count: Nombre de votes comptés
-  total_budget: Budget total
+  total_budget: Budget total

data/decidim-budgets/config/locales/it.yml

@@ -123,4 +123,4 @@ it:
         project_proposals: 'Proposte incluse in questo progetto:'
   index:
     confirmed_orders_count: Conteggio ordini
-  total_budget: Budget totale
+  total_budget: Budget totale

data/decidim-budgets/config/locales/nl.yml

@@ -2,4 +2,4 @@ nl:
   activemodel:
     attributes:
       project:
-        description: Beschrijving
+        description: Beschrijving

data/decidim-budgets/config/locales/pl.yml

@@ -0,0 +1,5 @@
+pl:
+  decidim:
+    budgets:
+      actions:
+        new: Nowy

data/decidim-budgets/lib/decidim/budgets/feature.rb

@@ -39,12 +39,14 @@ Decidim.register_feature(:budgets) do |feature|
     settings.attribute :total_budget, type: :integer, default: 100_000_000
     settings.attribute :vote_threshold_percent, type: :integer, default: 70
     settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
   feature.settings(:step) do |settings|
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :votes_enabled, type: :boolean, default: true
     settings.attribute :show_votes, type: :boolean, default: false
+    settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
   feature.seeds do |process|

data/decidim-budgets/spec/features/admin_manages_projects_spec.rb

@@ -9,4 +9,5 @@ describe "Admin manages projects", type: :feature do
   include_context "feature admin"
 
   it_behaves_like "manage projects"
+  it_behaves_like "manage announcements"
 end

data/decidim-budgets/spec/features/orders_spec.rb

@@ -90,14 +90,14 @@ describe "Orders", type: :feature do
         end
 
         expect(page).to have_content "ASSIGNED: €0"
-        expect(page).not_to have_content "1 project selected"
-        expect(page).not_to have_selector ".budget-summary__selected"
+        expect(page).to have_no_content "1 project selected"
+        expect(page).to have_no_selector ".budget-summary__selected"
 
         within "#order-progress .budget-summary__progressbox" do
           expect(page).to have_content "0%"
         end
 
-        expect(page).not_to have_selector ".budget-list__data--added"
+        expect(page).to have_no_selector ".budget-list__data--added"
       end
 
       context "and try to vote a project that exceed the total budget" do
@@ -139,7 +139,7 @@ describe "Orders", type: :feature do
           expect(page).to have_content("successfully")
 
           within "#order-progress .budget-summary__progressbox" do
-            expect(page).not_to have_selector("button.small")
+            expect(page).to have_no_selector("button.small")
           end
         end
       end
@@ -168,7 +168,7 @@ describe "Orders", type: :feature do
         end
 
         within ".budget-summary" do
-          expect(page).not_to have_selector(".cancel-order")
+          expect(page).to have_no_selector(".cancel-order")
         end
       end
     end

data/decidim-budgets/spec/features/process_admin_manages_projects_spec.rb

@@ -9,4 +9,5 @@ describe "Process admin manages projects", type: :feature do
   include_context "feature process admin"
 
   it_behaves_like "manage projects"
+  it_behaves_like "manage announcements"
 end

data/decidim-budgets/spec/i18n_spec.rb

@@ -2,6 +2,6 @@
 
 require "decidim/dev/test/i18n_shared_examples"
 
-RSpec.describe "I18n sanity" do
+describe "I18n sanity" do
   include_examples "I18n sanity"
 end

data/decidim-budgets/spec/shared/manage_attachments_examples.rb

@@ -2,7 +2,7 @@
 
 require "decidim/admin/test/manage_attachments_examples"
 
-RSpec.shared_examples "manage project attachments" do
+shared_examples "manage project attachments" do
   let(:attached_to) { project }
 
   before do

data/decidim-budgets/spec/shared/manage_projects_examples.rb

@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 # frozen_string_literal: true
 
-RSpec.shared_examples "manage projects" do
+shared_examples "manage projects" do
   it "updates a project" do
     within find("tr", text: translated(project.title)) do
       find("a.action-icon--edit").click
@@ -83,7 +82,7 @@ RSpec.shared_examples "manage projects" do
       )
       fill_in :project_budget, with: 22_000_000
 
-      select scope.name, from: :project_decidim_scope_id
+      select2 translated(scope.name), xpath: '//select[@id="project_decidim_scope_id"]/..', search: true
       select translated(category.name), from: :project_decidim_category_id
 
       find("*[type=submit]").click
@@ -115,7 +114,7 @@ RSpec.shared_examples "manage projects" do
       end
 
       within "table" do
-        expect(page).to_not have_content(translated(project2.title))
+        expect(page).to have_no_content(translated(project2.title))
       end
     end
   end

data/decidim-comments/app/frontend/fragments/add_comment_form_commentable.fragment.graphql

@@ -1,4 +1,4 @@
 fragment AddCommentFormCommentable on Commentable {
   id
   type
-}
+}

data/decidim-comments/app/frontend/fragments/add_comment_form_session.fragment.graphql

@@ -3,4 +3,4 @@ fragment AddCommentFormSession on Session {
     id
     name
   }
-}
+}

data/decidim-comments/app/frontend/fragments/comment.fragment.graphql

@@ -11,4 +11,4 @@ fragment Comment on Comment {
       }
     }
   }
-}
+}

data/decidim-comments/app/frontend/fragments/comment_data.fragment.graphql

@@ -20,4 +20,4 @@ fragment CommentData on Comment {
   alreadyReported
   ...UpVoteButton
   ...DownVoteButton
-}
+}

data/decidim-comments/app/frontend/fragments/comment_thread.fragment.graphql

@@ -3,4 +3,4 @@
 fragment CommentThread on Comment {
   hasComments
   ...Comment
-}
+}

data/decidim-comments/app/frontend/fragments/down_vote_button.fragment.graphql

@@ -3,4 +3,4 @@ fragment DownVoteButton on Comment {
   downVotes
   downVoted
   upVoted
-}
+}