decidim 0.4.0 → 0.4.1

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

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

data/decidim-proposals/spec/models/decidim/proposals/abilities/{process_admin_user_spec.rb → participatory_process_admin_ability.rb}

@@ -2,10 +2,14 @@
 
 require "spec_helper"
 
-describe Decidim::Proposals::Abilities::ProcessAdminUser do
+describe Decidim::Proposals::Abilities::ParticipatoryProcessAdminAbility do
   let(:user) { build(:user) }
   let(:user_process) { create :participatory_process, organization: user.organization }
-  let(:context) { {} }
+  let!(:user_process_role) { create :participatory_process_user_role, user: user, participatory_process: user_process, role: :admin }
+  let(:feature) { create :proposal_feature, participatory_process: user_process }
+  let(:proposals) { create_list :proposal, 3, feature: feature }
+  let(:other_proposals) { create_list :proposal, 3 }
+  let(:context) { { current_participatory_process: user_process } }
 
   subject { described_class.new(user, context) }
 
@@ -23,6 +27,7 @@ describe Decidim::Proposals::Abilities::ProcessAdminUser do
   context "when creation is disabled" do
     let(:context) do
       {
+        current_participatory_process: user_process,
         current_settings: double(creation_enabled?: false),
         feature_settings: double(official_proposals_enabled: true)
       }
@@ -34,6 +39,7 @@ describe Decidim::Proposals::Abilities::ProcessAdminUser do
   context "when official proposals are disabled" do
     let(:context) do
       {
+        current_participatory_process: user_process,
         current_settings: double(creation_enabled?: true),
         feature_settings: double(official_proposals_enabled: false)
       }
@@ -45,6 +51,7 @@ describe Decidim::Proposals::Abilities::ProcessAdminUser do
   context "when proposal_answering is disabled in step level" do
     let(:context) do
       {
+        current_participatory_process: user_process,
         current_settings: double(proposal_answering_enabled: false)
       }
     end
@@ -55,6 +62,7 @@ describe Decidim::Proposals::Abilities::ProcessAdminUser do
   context "when proposal_answering is disabled in feature level" do
     let(:context) do
       {
+        current_participatory_process: user_process,
         feature_settings: double(proposal_answering_enabled: false)
       }
     end

data/decidim-proposals/spec/services/decidim/proposals/proposal_serializer_spec.rb

@@ -7,6 +7,7 @@ module Decidim
     describe ProposalSerializer do
       let!(:proposal) { create(:proposal) }
       let!(:category) { create(:category, participatory_process: feature.participatory_process) }
+      let!(:scope) { create(:scope, organization: feature.participatory_process.organization) }
       let(:participatory_process) { feature.participatory_process }
       let(:feature) { proposal.feature }
 
@@ -15,6 +16,7 @@ module Decidim
 
       before do
         proposal.update_attribute(:category, category)
+        proposal.update_attribute(:scope, scope)
         proposal.link_resources(meetings, "proposals_from_meeting")
       end
 
@@ -34,6 +36,11 @@ module Decidim
           expect(serialized[:category]).to include(name: category.name)
         end
 
+        it "serializes the scope" do
+          expect(serialized[:scope]).to include(id: scope.id)
+          expect(serialized[:scope]).to include(name: scope.name)
+        end
+
         it "serializes the title" do
           expect(serialized).to include(title: proposal.title)
         end

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -229,6 +229,27 @@ RSpec.shared_examples "manage proposals" do
         end
       end
 
+      it "can mark a proposal as evaluating" do
+        within find("tr", text: proposal.title) do
+          find("a.action-icon--edit-answer").click
+        end
+
+        within ".edit_proposal_answer" do
+          choose "Evaluating"
+          click_button "Answer"
+        end
+
+        within ".callout-wrapper" do
+          expect(page).to have_content("Proposal successfully answered")
+        end
+
+        within find("tr", text: proposal.title) do
+          within find("td:nth-child(4)") do
+            expect(page).to have_content("Evaluating")
+          end
+        end
+      end
+
       it "can edit a proposal answer" do
         proposal.update_attributes!(
           state: "rejected",

data/decidim-results/app/controllers/decidim/results/results_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     # Exposes the result resource so users can view them
     class ResultsController < Decidim::Results::ApplicationController
       include FilterResource
+      include Paginable
       helper Decidim::WidgetUrlsHelper
 
       helper_method :results, :result, :stats_calculator
@@ -12,7 +13,7 @@ module Decidim
       private
 
       def results
-        @results ||= search.results.order("title -> '#{I18n.locale}' ASC").page(params[:page]).per(12)
+        @results ||= paginate(search.results.order("title -> '#{I18n.locale}' ASC"))
       end
 
       def result

data/decidim-results/app/views/decidim/results/results/_results.html.erb

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/results_per_page" %>
+
 <div class="row small-up-1 medium-up-2 card-grid">
   <% results.each do |result| %>
     <div class="column">

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

@@ -23,7 +23,7 @@ ca:
         result_meetings: Trobades relacionades
     results:
       actions:
-        confirm_destroy: Esteu segur que voleu suprimir aquest resultat?
+        confirm_destroy: Segur que vols suprimir aquest resultat?
         destroy: Esborra
         edit: Edita
         new: Nou

data/decidim-results/spec/features/comments_spec.rb

@@ -7,7 +7,7 @@ describe "Comments", type: :feature, perform_enqueued: true do
   let!(:participatory_process) { feature.participatory_process }
   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-results/spec/features/explore_results_spec.rb

@@ -71,6 +71,17 @@ describe "Explore results", type: :feature do
         end
       end
     end
+
+    context "when paginating" do
+      before do
+        Decidim::Results::Result.destroy_all
+      end
+
+      let!(:collection) { create_list :result, collection_size, feature: feature }
+      let!(:resource_selector) { ".card--result" }
+
+      it_behaves_like "a paginated resource"
+    end
   end
 
   context "show" do

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

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

data/decidim-surveys/app/models/decidim/surveys/abilities/{current_user.rb → current_user_ability.rb}

@@ -5,7 +5,7 @@ module Decidim
     module Abilities
       # Defines the abilities related to surveys for a logged in user.
       # Intended to be used with `cancancan`.
-      class CurrentUser
+      class CurrentUserAbility
         include CanCan::Ability
 
         attr_reader :user, :context

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    module Abilities
+      # Defines the abilities related to surveys 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, Survey do |survey|
+            can_manage_process?(survey.feature.participatory_process)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -58,7 +58,7 @@ ca:
           answer_survey:
             anonymous_user_message: <a href="%{sign_in_link}">Entra amb el teu compte</a> o <a href="%{sign_up_link}">dona't d'alta</a> per contestar l'enquesta.
             title: Respon a l'enquesta
-          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les respostes. N'estàs segur?
+          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les respostes. Segur que vols seguir?
           submit: Enviar
           survey_answered:
             body: Ja ha respost a aquesta enquesta.

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

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

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

@@ -17,7 +17,7 @@ module Decidim
 
       initializer "decidim_surveys.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.abilities += ["Decidim::Surveys::Abilities::CurrentUser"]
+          config.abilities += ["Decidim::Surveys::Abilities::CurrentUserAbility"]
         end
       end
     end

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

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

data/decidim-surveys/spec/models/decidim/surveys/abilities/{current_user_spec.rb → current_user_ability_spec.rb}

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Decidim::Surveys::Abilities::CurrentUser do
+describe Decidim::Surveys::Abilities::CurrentUserAbility do
   let(:organization) { build(:organization) }
   let(:user) { build(:user, organization: organization) }
   let(:participatory_process) { build(:participatory_process, organization: organization) }

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

@@ -2,10 +2,11 @@
 
 require "spec_helper"
 
-describe Decidim::Surveys::Abilities::ProcessAdminUser do
+describe Decidim::Surveys::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-system/app/commands/decidim/system/register_organization.rb

@@ -52,10 +52,10 @@ module Decidim
       end
 
       def invite_user_form(organization)
-        Decidim::InviteAdminForm.from_params(
+        Decidim::InviteUserForm.from_params(
           name: form.organization_admin_name,
           email: form.organization_admin_email,
-          roles: %w(admin),
+          admin: true,
           invitation_instructions: "organization_admin_invitation_instructions"
         ).with_context(
           current_user: form.current_user,

data/decidim-system/spec/commands/decidim/system/register_organization_spec.rb

@@ -45,7 +45,7 @@ module Decidim
 
             expect(admin.email).to eq("f.laguardia@gotham.gov")
             expect(admin.organization.name).to eq("Gotham City")
-            expect(admin.roles).to include("admin")
+            expect(admin).to be_admin
             expect(admin).to be_created_by_invite
           end
 

data/docs/getting_started.md

@@ -99,7 +99,7 @@ Once you've successfully deployed your app to your favorite platform, you'll nee
 ```ruby
 email = <your email>
 password = <a secure password>
-user = Decidim::System::Admin.new(email: my_email, password: my_password, password_confirmation: my_password)
+user = Decidim::System::Admin.new(email: email, password: password, password_confirmation: password)
 user.save!
 ```
 

data/lib/generators/decidim/templates/initializer.rb

@@ -16,8 +16,8 @@ Decidim.configure do |config|
   #   here_app_code: Rails.application.secrets.geocoder[:here_app_code]
   # }
 
-  # Custom calculate reference method
-  # config.calculate_reference_method = lambda do |resource|
+  # Custom resource reference generator method
+  # config.resource_reference_generator = lambda do |resource, feature|
   #   # Implement your custom method to generate resources references
   #   "1234-#{resource.id}"
   # end

data/package.json

@@ -18,8 +18,7 @@
     "graphql:download_schema": "apollo-codegen download-schema http://localhost:3000/api --output schema.json",
     "pregraphql:generate_schema_types": "yarn run graphql:download_schema",
     "graphql:generate_schema_types": "apollo-codegen generate decidim-comments/**/*.graphql --schema schema.json --target typescript --output decidim-comments/app/frontend/support/schema.ts",
-    "postgraphql:generate_schema_types": "rm schema.json",
-    "precommit": "bundle exec rubocop -a `git diff --name-only master` && git commit -a --amend --no-edit --no-verify"
+    "postgraphql:generate_schema_types": "rm schema.json"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.0",
@@ -51,7 +50,6 @@
     "eslint-plugin-react": "^7.1.0",
     "expose-loader": "~0.7.1",
     "faker": "^4.1.0",
-    "husky": "^0.14.3",
     "jest": "^20.0.4",
     "json-loader": "~0.5.4",
     "progress-bar-webpack-plugin": "^1.10.0",

data/yarn.lock

@@ -86,7 +86,11 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^15.0.36":
+"@types/react@*":
+  version "15.0.25"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.25.tgz#d396949cccc9a90b61755def9781e5aced9b2261"
+
+"@types/react@^15.0.36":
   version "15.0.36"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-15.0.36.tgz#35cb9153eaaae0750ea50e0a8eaee1d93f42c189"
 
@@ -206,7 +210,22 @@ anymatch@^1.3.0:
     arrify "^1.0.0"
     micromatch "^2.1.5"
 
-apollo-client@^1.4.0, apollo-client@^1.8.0:
+apollo-client@^1.4.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-1.7.0.tgz#3d6fdf6ead0a07d3e02d32d9191f26cbcfb6e4f6"
+  dependencies:
+    graphql "^0.10.0"
+    graphql-anywhere "^3.0.1"
+    graphql-tag "^2.0.0"
+    redux "^3.4.0"
+    symbol-observable "^1.0.2"
+    whatwg-fetch "^2.0.0"
+  optionalDependencies:
+    "@types/async" "^2.0.31"
+    "@types/graphql" "^0.9.0"
+    "@types/isomorphic-fetch" "0.0.34"
+
+apollo-client@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-1.8.0.tgz#3b5d1976a06a0f82b2fc66fe71754868193dadb9"
   dependencies:
@@ -2872,14 +2891,6 @@ https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
-husky@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  dependencies:
-    is-ci "^1.0.10"
-    normalize-path "^1.0.0"
-    strip-indent "^2.0.0"
-
 iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
@@ -4054,10 +4065,6 @@ normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-
 normalize-path@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -5181,10 +5188,6 @@ strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
-strip-indent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,154 +18,154 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
@@ -404,14 +405,12 @@ files:
 - decidim-admin/app/jobs/decidim/admin/newsletter_delivery_job.rb
 - decidim-admin/app/jobs/decidim/admin/newsletter_job.rb
 - decidim-admin/app/mailers/decidim/admin/application_mailer.rb
-- decidim-admin/app/models/decidim/admin/abilities/admin_user.rb
-- decidim-admin/app/models/decidim/admin/abilities/base.rb
-- decidim-admin/app/models/decidim/admin/abilities/collaborator_user.rb
-- decidim-admin/app/models/decidim/admin/abilities/participatory_process_admin.rb
+- decidim-admin/app/models/decidim/admin/abilities/admin_ability.rb
+- decidim-admin/app/models/decidim/admin/abilities/base_ability.rb
+- decidim-admin/app/models/decidim/admin/abilities/participatory_process_admin_ability.rb
+- decidim-admin/app/models/decidim/admin/abilities/participatory_process_collaborator_ability.rb
+- decidim-admin/app/models/decidim/admin/abilities/participatory_process_moderator_ability.rb
 - decidim-admin/app/models/decidim/admin/application_record.rb
-- decidim-admin/app/models/decidim/admin/participatory_process_user_role.rb
-- decidim-admin/app/queries/decidim/admin/manageable_participatory_processes_for_user.rb
-- decidim-admin/app/queries/decidim/admin/process_admin_roles_for_process.rb
 - decidim-admin/app/queries/decidim/admin/process_admins.rb
 - decidim-admin/app/queries/decidim/admin/user_groups_evaluation.rb
 - decidim-admin/app/views/decidim/admin/attachments/_form.html.erb
@@ -506,7 +505,7 @@ files:
 - decidim-admin/config/routes.rb
 - decidim-admin/db/migrate/20161102144648_add_admin_participatory_process_user_roles.rb
 - decidim-admin/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb
-- decidim-admin/db/seeds.rb
+- decidim-admin/db/migrate/20170714083651_rename_participatory_process_user_roles_table.rb
 - decidim-admin/decidim-admin.gemspec
 - decidim-admin/lib/decidim/admin.rb
 - decidim-admin/lib/decidim/admin/engine.rb
@@ -585,13 +584,10 @@ files:
 - decidim-admin/spec/jobs/export_job_spec.rb
 - decidim-admin/spec/jobs/newsletter_delivery_job_spec.rb
 - decidim-admin/spec/jobs/newsletter_job_spec.rb
-- decidim-admin/spec/models/abilities/admin_user_spec.rb
-- decidim-admin/spec/models/abilities/collaborator_user_spec.rb
-- decidim-admin/spec/models/abilities/participatory_process_admin_spec.rb
-- decidim-admin/spec/models/participatory_process_user_role_spec.rb
+- decidim-admin/spec/models/abilities/admin_ability_spec.rb
+- decidim-admin/spec/models/abilities/participatory_process_admin_ability_spec.rb
+- decidim-admin/spec/models/abilities/participatory_process_collaborator_ability_spec.rb
 - decidim-admin/spec/organization_dashboard_constraint_spec.rb
-- decidim-admin/spec/queries/manageable_participatory_processes_for_user_spec.rb
-- decidim-admin/spec/queries/process_admin_roles_for_process_spec.rb
 - decidim-admin/spec/queries/process_admins_spec.rb
 - decidim-admin/spec/queries/user_group_evaluation_spec.rb
 - decidim-admin/spec/shared/manage_process_admins_examples.rb
@@ -791,8 +787,10 @@ files:
 - decidim-comments/app/frontend/support/resolve_graphql_query.ts
 - decidim-comments/app/frontend/support/schema.ts
 - decidim-comments/app/mailers/decidim/comments/comment_notification_mailer.rb
-- decidim-comments/app/models/decidim/comments/abilities/admin_user.rb
-- decidim-comments/app/models/decidim/comments/abilities/process_admin_user.rb
+- decidim-comments/app/models/decidim/comments/abilities/admin_ability.rb
+- decidim-comments/app/models/decidim/comments/abilities/current_user_ability.rb
+- decidim-comments/app/models/decidim/comments/abilities/participatory_process_admin_ability.rb
+- decidim-comments/app/models/decidim/comments/abilities/participatory_process_moderator_ability.rb
 - decidim-comments/app/models/decidim/comments/application_record.rb
 - decidim-comments/app/models/decidim/comments/comment.rb
 - decidim-comments/app/models/decidim/comments/comment_vote.rb
@@ -852,8 +850,8 @@ files:
 - decidim-comments/spec/lib/comment_serializer_spec.rb
 - decidim-comments/spec/lib/export_spec.rb
 - decidim-comments/spec/mailers/comment_notification_mailer_spec.rb
-- decidim-comments/spec/models/abilities/admin_user_spec.rb
-- decidim-comments/spec/models/abilities/process_admin_user_spec.rb
+- decidim-comments/spec/models/abilities/admin_ability_spec.rb
+- decidim-comments/spec/models/abilities/participatory_process_admin_ability_spec.rb
 - decidim-comments/spec/models/comment_spec.rb
 - decidim-comments/spec/models/comment_vote_spec.rb
 - decidim-comments/spec/models/seed_spec.rb
@@ -961,7 +959,6 @@ files:
 - decidim-meetings/app/views/decidim/meetings/admin/meetings/edit.html.erb
 - decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb
 - decidim-meetings/app/views/decidim/meetings/admin/meetings/new.html.erb
-- decidim-meetings/app/views/decidim/meetings/meeting_widgets/.erb
 - decidim-meetings/app/views/decidim/meetings/meeting_widgets/show.html.erb
 - decidim-meetings/app/views/decidim/meetings/meetings/_datetime.html.erb
 - decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb
@@ -1094,9 +1091,10 @@ files:
 - decidim-proposals/app/helpers/decidim/proposals/application_helper.rb
 - decidim-proposals/app/helpers/decidim/proposals/map_helper.rb
 - decidim-proposals/app/helpers/decidim/proposals/proposal_votes_helper.rb
-- decidim-proposals/app/models/decidim/proposals/abilities/admin_user.rb
-- decidim-proposals/app/models/decidim/proposals/abilities/current_user.rb
-- decidim-proposals/app/models/decidim/proposals/abilities/process_admin_user.rb
+- decidim-proposals/app/models/decidim/proposals/abilities/admin_ability.rb
+- decidim-proposals/app/models/decidim/proposals/abilities/current_user_ability.rb
+- decidim-proposals/app/models/decidim/proposals/abilities/participatory_process_admin_ability.rb
+- decidim-proposals/app/models/decidim/proposals/abilities/participatory_process_moderator_ability.rb
 - decidim-proposals/app/models/decidim/proposals/application_record.rb
 - decidim-proposals/app/models/decidim/proposals/proposal.rb
 - decidim-proposals/app/models/decidim/proposals/proposal_vote.rb
@@ -1182,8 +1180,8 @@ files:
 - decidim-proposals/spec/helpers/proposal_votes_helper_spec.rb
 - decidim-proposals/spec/i18n_spec.rb
 - decidim-proposals/spec/lib/decidim/proposals/feature_spec.rb
-- decidim-proposals/spec/models/decidim/proposals/abilities/admin_user_spec.rb
-- decidim-proposals/spec/models/decidim/proposals/abilities/process_admin_user_spec.rb
+- decidim-proposals/spec/models/decidim/proposals/abilities/admin_ability_spec.rb
+- decidim-proposals/spec/models/decidim/proposals/abilities/participatory_process_admin_ability.rb
 - decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb
 - decidim-proposals/spec/models/decidim/proposals/proposal_vote_spec.rb
 - decidim-proposals/spec/queries/decidim/proposals/filtered_proposals_spec.rb
@@ -1284,9 +1282,9 @@ files:
 - decidim-surveys/app/forms/decidim/surveys/survey_answer_form.rb
 - decidim-surveys/app/forms/decidim/surveys/survey_form.rb
 - decidim-surveys/app/helpers/decidim/surveys/admin/application_helper.rb
-- decidim-surveys/app/models/decidim/surveys/abilities/admin_user.rb
-- decidim-surveys/app/models/decidim/surveys/abilities/current_user.rb
-- decidim-surveys/app/models/decidim/surveys/abilities/process_admin_user.rb
+- decidim-surveys/app/models/decidim/surveys/abilities/admin_ability.rb
+- decidim-surveys/app/models/decidim/surveys/abilities/current_user_ability.rb
+- decidim-surveys/app/models/decidim/surveys/abilities/participatory_process_admin_ability.rb
 - decidim-surveys/app/models/decidim/surveys/application_record.rb
 - decidim-surveys/app/models/decidim/surveys/survey.rb
 - decidim-surveys/app/models/decidim/surveys/survey_answer.rb
@@ -1333,9 +1331,9 @@ files:
 - decidim-surveys/spec/forms/decidim/surveys/admin/survey_question_form_spec.rb
 - decidim-surveys/spec/forms/decidim/surveys/survey_answer_form_spec.rb
 - decidim-surveys/spec/forms/decidim/surveys/survey_form_spec.rb
-- decidim-surveys/spec/models/decidim/surveys/abilities/admin_user_spec.rb
-- decidim-surveys/spec/models/decidim/surveys/abilities/current_user_spec.rb
-- decidim-surveys/spec/models/decidim/surveys/abilities/process_admin_user_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/abilities/admin_ability_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/abilities/current_user_ability_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/abilities/participatory_process_admin_ability_spec.rb
 - decidim-surveys/spec/models/decidim/surveys/survey_answer_spec.rb
 - decidim-surveys/spec/models/decidim/surveys/survey_question_spec.rb
 - decidim-surveys/spec/models/decidim/surveys/survey_spec.rb