decidim 0.4.0 → 0.4.1

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

@@ -150,7 +150,7 @@ ca:
           error: S'ha produït un error en crear aquesta categoria.
           success: Categoria creada correctament.
         destroy:
-          error: S'ha produït un error en eliminar aquesta categoria. Si us plau, elimini qualsevol subcategoria en primer lloc, assegureu-vos que cap altra entitat pertany a aquesta categoria i torni a intentar-ho.
+          error: S'ha produït un error en eliminar aquesta categoria. Si us plau, elimina qualsevol subcategoria en primer lloc, assegura't que cap altra entitat pertany a aquesta categoria i torna a intentar-ho.
           success: Categoria eliminada correctament.
         edit:
           title: Edita categoria
@@ -281,6 +281,7 @@ ca:
           roles:
             admin: Administrador
             collaborator: Col·laborador
+            moderator: Moderador
         scope:
           fields:
             created_at: Data de creació
@@ -331,13 +332,13 @@ ca:
         form:
           interpolations_hint: 'Consell: Podeu utilitzar "%{name}" en qualsevol part del cos o assumpte i serà reemplaçat pel nom del destinatari.'
         index:
-          confirm_delete: Esteu segur que voleu suprimir aquest butlletí?
+          confirm_delete: Segur que vols suprimir aquest butlletí?
           title: Butlletins
         new:
           save: Desar
           title: Nou butlletí
         show:
-          confirm_deliver: Estàs segur de que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
+          confirm_deliver: Segur que vols enviar aquest butlletí? Aquesta acció no es pot desfer.
           deliver: Enviar butlletí
           preview: Previsualitzar
           subject: Assumpte

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

@@ -282,6 +282,7 @@ en:
           roles:
             admin: Administrator
             collaborator: Collaborator
+            moderator: Moderator
         scope:
           fields:
             created_at: Created at

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

@@ -281,6 +281,7 @@ es:
           roles:
             admin: Administrador
             collaborator: Colaborador
+            moderator: Moderador
         scope:
           fields:
             created_at: Fecha de creación
@@ -553,8 +554,6 @@ es:
     participatory_processes:
       participatory_process_groups:
         none: Ninguno
-  forms:
-    required: Obligatorio
   layouts:
     decidim:
       admin:

data/decidim-admin/db/migrate/20170714083651_rename_participatory_process_user_roles_table.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameParticipatoryProcessUserRolesTable < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :decidim_admin_participatory_process_user_roles, :decidim_participatory_process_user_roles
+  end
+end

data/decidim-admin/lib/decidim/admin/engine.rb

@@ -13,8 +13,6 @@ require "foundation_rails_helper"
 require "autoprefixer-rails"
 require "rectify"
 
-require_dependency File.join(__dir__, "..", "..", "..", "app/models/decidim/admin/abilities/admin_user")
-
 module Decidim
   module Admin
     # Decidim's core Rails Engine.
@@ -33,9 +31,12 @@ module Decidim
 
       initializer "decidim_admin.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.abilities += ["Decidim::Admin::Abilities::AdminUser"]
-          config.abilities += ["Decidim::Admin::Abilities::ParticipatoryProcessAdmin"]
-          config.abilities += ["Decidim::Admin::Abilities::CollaboratorUser"]
+          config.admin_abilities += [
+            "Decidim::Admin::Abilities::AdminAbility",
+            "Decidim::Admin::Abilities::ParticipatoryProcessAdminAbility",
+            "Decidim::Admin::Abilities::ParticipatoryProcessCollaboratorAbility",
+            "Decidim::Admin::Abilities::ParticipatoryProcessModeratorAbility"
+          ]
         end
       end
 
@@ -57,7 +58,8 @@ module Decidim
                     decidim_admin.participatory_process_groups_path,
                     icon_name: "layers",
                     position: 3,
-                    active: :inclusive
+                    active: :inclusive,
+                    if: can?(:read, Decidim::ParticipatoryProcessGroup)
 
           menu.item I18n.t("menu.static_pages", scope: "decidim.admin"),
                     decidim_admin.static_pages_path,

data/decidim-admin/lib/decidim/admin/test/factories.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryGirl.define do
-  factory :participatory_process_user_role, class: Decidim::Admin::ParticipatoryProcessUserRole do
+  factory :participatory_process_user_role, class: Decidim::ParticipatoryProcessUserRole do
     user
     participatory_process
     role "admin"

data/decidim-admin/spec/commands/create_participatory_process_admin_spec.rb

@@ -32,7 +32,7 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
   context "when everything is ok" do
     it "creates the user role" do
       subject.call
-      roles = Decidim::Admin::ParticipatoryProcessUserRole.where(user: user)
+      roles = Decidim::ParticipatoryProcessUserRole.where(user: user)
 
       expect(roles.count).to eq 1
       expect(roles.first.role).to eq "admin"
@@ -40,7 +40,7 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
 
     it "creates a new user with no application admin privileges" do
       subject.call
-      expect(Decidim::User.last.roles).not_to include("admin")
+      expect(Decidim::User.last).not_to be_admin
     end
 
     context "when there is no user with the given email" do
@@ -53,7 +53,7 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
 
       it "creates a new user with no application admin privileges" do
         subject.call
-        expect(Decidim::User.last.roles).not_to include("admin")
+        expect(Decidim::User.last).not_to be_admin
       end
     end
 
@@ -65,7 +65,7 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
       it "doesn't get created twice" do
         expect { subject.call }.to broadcast(:ok)
 
-        roles = Decidim::Admin::ParticipatoryProcessUserRole.where(user: user)
+        roles = Decidim::ParticipatoryProcessUserRole.where(user: user)
 
         expect(roles.count).to eq 1
         expect(roles.first.role).to eq "admin"

data/decidim-admin/spec/models/abilities/{admin_user_spec.rb → admin_ability_spec.rb}

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Decidim::Admin::Abilities::AdminUser do
+describe Decidim::Admin::Abilities::AdminAbility do
   let(:user) { build(:user, :admin) }
 
   subject { described_class.new(user, {}) }

data/decidim-admin/spec/models/abilities/{participatory_process_admin_spec.rb → participatory_process_admin_ability_spec.rb}

@@ -2,11 +2,11 @@
 
 require "spec_helper"
 
-describe Decidim::Admin::Abilities::ParticipatoryProcessAdmin do
+describe Decidim::Admin::Abilities::ParticipatoryProcessAdminAbility do
   let(:user) { build(:user) }
   let(:user_process) { create :participatory_process, organization: user.organization }
 
-  subject { described_class.new(user, {}) }
+  subject { described_class.new(user, current_participatory_process: user_process) }
 
   context "when the user does not admin any process" do
     it { is_expected.not_to be_able_to(:read, :admin_dashboard) }
@@ -30,7 +30,7 @@ describe Decidim::Admin::Abilities::ParticipatoryProcessAdmin do
     let(:unmanaged_process_moderation) { create(:moderation) }
 
     before do
-      create :participatory_process_user_role, user: user, participatory_process: user_process
+      create :participatory_process_user_role, user: user, participatory_process: user_process, role: :admin
     end
 
     it { is_expected.to be_able_to(:read, :admin_dashboard) }

data/decidim-admin/spec/models/abilities/participatory_process_collaborator_ability_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::Abilities::ParticipatoryProcessCollaboratorAbility do
+  let(:user) { build(:user) }
+  let(:user_process) { create :participatory_process, organization: user.organization }
+  let(:unmanaged_process) { create :participatory_process, organization: user.organization }
+
+  subject { described_class.new(user, current_participatory_process: user_process) }
+
+  before do
+    create :participatory_process_user_role, user: user, participatory_process: user_process, role: :collaborator
+  end
+
+  it { is_expected.to be_able_to(:preview, user_process) }
+  it { is_expected.not_to be_able_to(:preview, unmanaged_process) }
+end

data/decidim-admin/spec/queries/process_admins_spec.rb

@@ -8,7 +8,7 @@ describe Decidim::Admin::ProcessAdmins do
   let!(:admin) { create(:user, :admin, :confirmed, organization: organization) }
   let!(:participatory_process_admin) do
     user = create(:user, :confirmed, organization: organization)
-    Decidim::Admin::ParticipatoryProcessUserRole.create!(
+    Decidim::ParticipatoryProcessUserRole.create!(
       role: :admin,
       user: user,
       participatory_process: participatory_process

data/decidim-admin/spec/views/decidim/static_pages/_form.html.erb_spec.rb

@@ -15,7 +15,7 @@ module Decidim
       )
     end
     let(:ability) do
-      Decidim::Admin::Abilities::AdminUser.new(build(:user, :admin), {})
+      Decidim::Admin::Abilities::AdminAbility.new(build(:user, :admin), {})
     end
 
     before do

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

@@ -12,7 +12,7 @@ ca:
     budgets:
       actions:
         attachments: Adjunts
-        confirm_destroy: Estàs segur que vols eliminar aquest projecte?
+        confirm_destroy: Segur que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
         new: Nou
@@ -58,7 +58,7 @@ ca:
           ok: D'acord
           title: Pressupost superat
         budget_summary:
-          are_you_sure: Estàs segur de que vols cancel·lar el teu vot?
+          are_you_sure: Segur que vols cancel·lar el teu vot?
           assigned: 'Assignat:'
           cancel_order: eliminar el teu vot i començar de nou
           checked_out:

data/decidim-comments/app/models/decidim/comments/abilities/admin_ability.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Comments
+    module Abilities
+      # Defines the abilities related to comments for a logged in admin user.
+      # Intended to be used with `cancancan`.
+      class AdminAbility < Decidim::Abilities::AdminAbility
+        def define_abilities
+          super
+
+          can :manage, Comment
+          can :unreport, Comment
+          can :hide, Comment
+        end
+      end
+    end
+  end
+end

data/decidim-comments/app/models/decidim/comments/abilities/{admin_user.rb → current_user_ability.rb}

@@ -3,22 +3,20 @@
 module Decidim
   module Comments
     module Abilities
-      # Defines the abilities related to comments for a logged in admin user.
+      # Defines the abilities related to comments for a logged in user.
       # Intended to be used with `cancancan`.
-      class AdminUser
+      class CurrentUserAbility
         include CanCan::Ability
 
         attr_reader :user, :context
 
         def initialize(user, context)
-          return unless user && user.role?(:admin)
+          return unless user
 
           @user = user
           @context = context
 
-          can :manage, Comment
-          can :unreport, Comment
-          can :hide, Comment
+          can :report, Decidim::Comments::Comment
         end
       end
     end

data/decidim-comments/app/models/decidim/comments/abilities/participatory_process_admin_ability.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Comments
+    module Abilities
+      # Defines the abilities related to comments for a logged in process admin user.
+      # Intended to be used with `cancancan`.
+      class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility
+        def define_participatory_process_abilities
+          super
+
+          can [:manage, :unreport, :hide], Comment do |comment|
+            can_manage_process?(comment.feature.participatory_process)
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-comments/app/models/decidim/comments/abilities/participatory_process_moderator_ability.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Comments
+    module Abilities
+      # Defines the abilities related to comments for a logged in process moderator user.
+      # Intended to be used with `cancancan`.
+      class ParticipatoryProcessModeratorAbility < Decidim::Abilities::ParticipatoryProcessModeratorAbility
+        def define_participatory_process_abilities
+          super
+
+          can [:unreport, :hide], Comment do |comment|
+            can_manage_process?(comment.feature.participatory_process)
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-comments/lib/decidim/comments/admin_engine.rb

@@ -10,8 +10,11 @@ module Decidim
 
       initializer "decidim_comments.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.admin_abilities += ["Decidim::Comments::Abilities::AdminUser"]
-          config.admin_abilities += ["Decidim::Comments::Abilities::ProcessAdminUser"]
+          config.admin_abilities += [
+            "Decidim::Comments::Abilities::AdminAbility",
+            "Decidim::Comments::Abilities::ParticipatoryProcessAdminAbility",
+            "Decidim::Comments::Abilities::ParticipatoryProcessModeratorAbility"
+          ]
         end
       end
 

data/decidim-comments/lib/decidim/comments/engine.rb

@@ -38,6 +38,12 @@ module Decidim
           end
         end
       end
+
+      initializer "decidim_comments.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.abilities += ["Decidim::Comments::Abilities::CurrentUserAbility"]
+        end
+      end
     end
   end
 end

data/decidim-comments/spec/models/abilities/{admin_user_spec.rb → admin_ability_spec.rb}

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Decidim::Comments::Abilities::AdminUser do
+describe Decidim::Comments::Abilities::AdminAbility do
   let(:user) { build(:user, :admin) }
   let(:context) { {} }
 

data/decidim-comments/spec/models/abilities/{process_admin_user_spec.rb → participatory_process_admin_ability_spec.rb}

@@ -2,10 +2,11 @@
 
 require "spec_helper"
 
-describe Decidim::Comments::Abilities::ProcessAdminUser do
+describe Decidim::Comments::Abilities::ParticipatoryProcessAdminAbility do
   let(:user) { build(:user) }
   let(:user_process) { create :participatory_process, organization: user.organization }
-  let(:context) { {} }
+  let!(:user_role) { create :participatory_process_user_role, user: user, participatory_process: user_process, role: :admin }
+  let(:context) { { current_participatory_process: user_process } }
 
   subject { described_class.new(user, context) }
 

data/decidim-meetings/app/controllers/decidim/meetings/meeting_widgets_controller.rb

@@ -3,6 +3,7 @@
 module Decidim
   module Meetings
     class MeetingWidgetsController < Decidim::WidgetsController
+      helper MeetingsHelper
       helper_method :model, :current_participatory_process
 
       private

data/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     # Exposes the meeting resource so users can view them
     class MeetingsController < Decidim::Meetings::ApplicationController
       include FilterResource
-
+      include Paginable
       helper Decidim::WidgetUrlsHelper
 
       helper_method :meetings, :geocoded_meetings, :meeting
@@ -29,7 +29,7 @@ module Decidim
       end
 
       def meetings
-        @meetings ||= search.results.page(params[:page]).per(12)
+        @meetings ||= paginate(search.results)
       end
 
       def geocoded_meetings

data/decidim-meetings/app/views/decidim/meetings/meeting_widgets/show.html.erb

@@ -1,6 +1,6 @@
 <%= content_for(:title, translated_attribute(model.title)) %>
 <%= render partial: "decidim/meetings/meetings/datetime", locals: { meeting: model } %>
-<%== translated_attribute model.description %>
+<%== meeting_description(model) %>
 <div class="address card__extra">
   <div class="address__icon">
     <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>

data/decidim-meetings/app/views/decidim/meetings/meetings/_meetings.html.erb

@@ -8,6 +8,8 @@
   </div>
 <% end %>
 
+<%= render partial: "decidim/shared/results_per_page" %>
+
 <div class="row small-up-1 medium-up-2 card-grid">
   <% meetings.each do |meeting| %>
     <div class="column">

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

@@ -25,7 +25,7 @@ ca:
       actions:
         attachments: Adjunts
         close: Tancar
-        confirm_destroy: Esteu segur de que voleu suprimir aquesta trobada?
+        confirm_destroy: Segur que vols suprimir aquesta trobada?
         destroy: Esborra
         edit: Edita
         new: Nova