decidim-admin 0.4.4 → 0.5.0

data/config/locales/it.yml

@@ -111,8 +111,6 @@ it:
         edit:
           title: Modifica allegato
           update: Aggiorna
-        index:
-          attachments_title: Allegati
         new:
           create: Crea allegato
           title: Nuovo allegato
@@ -129,8 +127,6 @@ it:
         edit:
           title: Modifica categoria
           update: Aggiorna
-        index:
-          categories_title: Categorie
         new:
           create: Crea nuova categoria
           title: Nuova categoria
@@ -239,7 +235,6 @@ it:
             collaborator: Collaboratore
         scope:
           fields:
-            created_at: Creato il
             name: Nome
         static_page:
           fields:
@@ -302,7 +297,6 @@ it:
         new:
           copy: Copia
           select: Scegli quale quale dato vuoi duplicare
-          title: Duplicazione di un processo partecipativo.
       participatory_process_groups:
         edit:
           title: Aggiorna un gruppo di processi
@@ -337,8 +331,6 @@ it:
         edit:
           title: Modifica una fase del processo partecipativo.
           update: Aggiorna
-        index:
-          steps_title: Fasi
         new:
           create: Crea
           title: Nuova fase del processo partecipativo.
@@ -356,8 +348,6 @@ it:
         edit:
           title: Aggiornamento utente di un processo partecipativo.
           update: Aggiorna
-        index:
-          process_admins_title: Utenti del processo partecipativo.
         new:
           create: Crea
           title: Nuovo utente per un processo partecipativo.

data/config/locales/nl.yml

@@ -5,4 +5,4 @@ nl:
         description: Beschrijving
   time:
     formats:
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"

data/config/locales/pl.yml

@@ -0,0 +1,7 @@
+pl:
+  activemodel:
+    attributes:
+      category:
+        name: Nazwa
+      feature:
+        name: Nazwa

data/config/routes.rb

@@ -4,12 +4,10 @@ Decidim::Admin::Engine.routes.draw do
   constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
     resource :organization, only: [:edit, :update], controller: "organization"
     resources :participatory_process_groups
-    resources :participatory_processes do
+    resources :participatory_processes, except: :show do
       resource :publish, controller: "participatory_process_publications", only: [:create, :destroy]
       resources :copies, controller: "participatory_process_copies", only: [:new, :create]
 
-      resources :categories
-
       resources :steps, controller: "participatory_process_steps" do
         resource :activate, controller: "participatory_process_step_activations", only: [:create, :destroy]
         collection do
@@ -22,16 +20,11 @@ Decidim::Admin::Engine.routes.draw do
         end
       end
       resources :attachments, controller: "participatory_process_attachments"
-
-      resources :moderations do
-        member do
-          put :unreport
-          put :hide
-        end
-      end
     end
 
     scope "/participatory_processes/:participatory_process_id" do
+      resources :categories
+
       resources :features do
         resource :permissions, controller: "feature_permissions"
         member do
@@ -40,6 +33,13 @@ Decidim::Admin::Engine.routes.draw do
         end
         resources :exports, only: :create
       end
+
+      resources :moderations do
+        member do
+          put :unreport
+          put :hide
+        end
+      end
     end
 
     scope "/participatory_processes/:participatory_process_id/features/:feature_id/manage" do
@@ -53,13 +53,26 @@ Decidim::Admin::Engine.routes.draw do
     end
 
     resources :static_pages
-    resources :scopes, except: [:show]
+    resources :scope_types, except: [:show]
+    resources :scopes, except: [:show] do
+      resources :scopes, except: [:show]
+    end
+
     resources :users, except: [:edit, :update], controller: "users" do
       member do
         post :resend_invitation, to: "users#resend_invitation"
       end
     end
 
+    resources :managed_users, controller: "managed_users", except: [:edit, :update] do
+      resources :promotions, controller: "managed_users/promotions", only: [:new, :create]
+      resources :impersonations, controller: "managed_users/impersonations", only: [:index, :new, :create] do
+        collection do
+          post :close_session
+        end
+      end
+    end
+
     resources :newsletters do
       member do
         get :preview

data/lib/decidim/admin/engine.rb

@@ -12,6 +12,7 @@ require "foundation-rails"
 require "foundation_rails_helper"
 require "autoprefixer-rails"
 require "rectify"
+require "select2-rails"
 
 module Decidim
   module Admin
@@ -33,6 +34,7 @@ module Decidim
         Decidim.configure do |config|
           config.admin_abilities += [
             "Decidim::Admin::Abilities::AdminAbility",
+            "Decidim::Admin::Abilities::UserManagerAbility",
             "Decidim::Admin::Abilities::ParticipatoryProcessAdminAbility",
             "Decidim::Admin::Abilities::ParticipatoryProcessCollaboratorAbility",
             "Decidim::Admin::Abilities::ParticipatoryProcessModeratorAbility"
@@ -52,7 +54,8 @@ module Decidim
                     decidim_admin.participatory_processes_path,
                     icon_name: "target",
                     position: 2,
-                    active: :inclusive
+                    active: :inclusive,
+                    if: can?(:manage, Decidim::ParticipatoryProcess)
 
           menu.item I18n.t("menu.participatory_process_groups", scope: "decidim.admin"),
                     decidim_admin.participatory_process_groups_path,
@@ -69,11 +72,11 @@ module Decidim
                     if: can?(:read, Decidim::StaticPage)
 
           menu.item I18n.t("menu.users", scope: "decidim.admin"),
-                    decidim_admin.users_path,
+                    can?(:read, :admin_users) ? decidim_admin.users_path : decidim_admin.managed_users_path,
                     icon_name: "person",
                     position: 5,
                     active: [%w(decidim/admin/user_groups decidim/admin/users), []],
-                    if: can?(:read, :admin_users)
+                    if: can?(:read, :admin_users) || can?(:read, :managed_users)
 
           menu.item I18n.t("menu.newsletters", scope: "decidim.admin"),
                     decidim_admin.newsletters_path,

data/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -1,103 +1,101 @@
-# -*- coding: utf-8 -*-
 # frozen_string_literal: true
 
-RSpec.shared_examples "manage attachments examples" do
-  let!(:attachment) do
-    Decidim::AttachmentUploader.enable_processing = true
-    create(:attachment, attached_to: attached_to)
-  end
-
-  before do
-    visit current_path
-  end
+shared_examples "manage attachments examples" do
+  context "processing attachments", processing_uploads_for: Decidim::AttachmentUploader do
+    let!(:attachment) { create(:attachment, attached_to: attached_to) }
 
-  it "lists all the attachments for the process" do
-    within "#attachments table" do
-      expect(page).to have_content(translated(attachment.title, locale: :en))
-      expect(page).to have_content(attachment.file_type)
+    before do
+      visit current_path
     end
-  end
 
-  it "can view an attachment details" do
-    within "#attachments table" do
-      click_link translated(attachment.title, locale: :en)
+    it "lists all the attachments for the process" do
+      within "#attachments table" do
+        expect(page).to have_content(translated(attachment.title, locale: :en))
+        expect(page).to have_content(attachment.file_type)
+      end
     end
 
-    expect(page).to have_selector("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
-    expect(page).to have_selector("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
-    expect(page).to have_css("img[src~='#{attachment.url}']")
-  end
-
-  it "can add attachments to a process" do
-    find(".card-title a.new").click
-
-    within ".new_participatory_process_attachment" do
-      fill_in_i18n(
-        :attachment_title,
-        "#attachment-title-tabs",
-        en: "Very Important Document",
-        es: "Documento Muy Importante",
-        ca: "Document Molt Important"
-      )
-
-      fill_in_i18n(
-        :attachment_description,
-        "#attachment-description-tabs",
-        en: "This document contains important information",
-        es: "Este documento contiene información importante",
-        ca: "Aquest document conté informació important"
-      )
-
-      attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
-      find("*[type=submit]").click
-    end
+    it "can view an attachment details" do
+      within "#attachments table" do
+        click_link translated(attachment.title, locale: :en)
+      end
 
-    within ".callout-wrapper" do
-      expect(page).to have_content("successfully")
+      expect(page).to have_selector("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
+      expect(page).to have_selector("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
+      expect(page).to have_css("img[src~='#{attachment.url}']")
     end
 
-    within "#attachments table" do
-      expect(page).to have_link("Very Important Document")
-    end
-  end
+    it "can add attachments to a process" do
+      find(".card-title a.new").click
+
+      within ".new_participatory_process_attachment" do
+        fill_in_i18n(
+          :attachment_title,
+          "#attachment-title-tabs",
+          en: "Very Important Document",
+          es: "Documento Muy Importante",
+          ca: "Document Molt Important"
+        )
+
+        fill_in_i18n(
+          :attachment_description,
+          "#attachment-description-tabs",
+          en: "This document contains important information",
+          es: "Este documento contiene información importante",
+          ca: "Aquest document conté informació important"
+        )
+
+        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+        find("*[type=submit]").click
+      end
 
-  it "can delete an attachment from a process" do
-    within find("tr", text: stripped(translated(attachment.title))) do
-      page.find("a.action-icon--remove").click
-    end
+      within ".callout-wrapper" do
+        expect(page).to have_content("successfully")
+      end
 
-    within ".callout-wrapper" do
-      expect(page).to have_content("successfully")
+      within "#attachments table" do
+        expect(page).to have_link("Very Important Document")
+      end
     end
 
-    expect(page).not_to have_content(translated(attachment.title, locale: :en))
-  end
-
-  it "can update an attachment" do
-    within "#attachments" do
+    it "can delete an attachment from a process" do
       within find("tr", text: stripped(translated(attachment.title))) do
-        page.find("a.action-icon--edit").click
+        page.find("a.action-icon--remove").click
       end
-    end
 
-    within ".edit_participatory_process_attachment" do
-      fill_in_i18n(
-        :attachment_title,
-        "#attachment-title-tabs",
-        en: "This is a nice photo",
-        es: "Una foto muy guay",
-        ca: "Aquesta foto és ben xula"
-      )
+      within ".callout-wrapper" do
+        expect(page).to have_content("successfully")
+      end
 
-      find("*[type=submit]").click
+      expect(page).to have_no_content(translated(attachment.title, locale: :en))
     end
 
-    within ".callout-wrapper" do
-      expect(page).to have_content("successfully")
-    end
+    it "can update an attachment" do
+      within "#attachments" do
+        within find("tr", text: stripped(translated(attachment.title))) do
+          page.find("a.action-icon--edit").click
+        end
+      end
 
-    within "#attachments table" do
-      expect(page).to have_link("This is a nice photo")
+      within ".edit_participatory_process_attachment" do
+        fill_in_i18n(
+          :attachment_title,
+          "#attachment-title-tabs",
+          en: "This is a nice photo",
+          es: "Una foto muy guay",
+          ca: "Aquesta foto és ben xula"
+        )
+
+        find("*[type=submit]").click
+      end
+
+      within ".callout-wrapper" do
+        expect(page).to have_content("successfully")
+      end
+
+      within "#attachments table" do
+        expect(page).to have_link("This is a nice photo")
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.1.3
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -152,20 +152,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -179,6 +193,9 @@ files:
 - Rakefile
 - app/assets/config/decidim_admin_manifest.js
 - app/assets/javascripts/decidim/admin/application.js.es6
+- app/assets/javascripts/decidim/admin/participatory_processes.js.es6
+- app/assets/javascripts/decidim/admin/scopes.js.es6
+- app/assets/javascripts/decidim/admin/select2.js.es6
 - app/assets/javascripts/decidim/admin/sort_list.component.js.es6
 - app/assets/javascripts/decidim/admin/tab_focus.js.es6
 - app/assets/javascripts/decidim/admin/toggle_nav.js.es6
@@ -215,6 +232,7 @@ files:
 - app/assets/stylesheets/decidim/admin/modules/_typography.scss
 - app/assets/stylesheets/decidim/admin/modules/_user-login.scss
 - app/assets/stylesheets/decidim/admin/plugins/_foundation-datepicker.scss
+- app/assets/stylesheets/decidim/admin/plugins/_select2.scss
 - app/assets/stylesheets/decidim/admin/utils/_fontface.scss
 - app/assets/stylesheets/decidim/admin/utils/_helpers.scss
 - app/assets/stylesheets/decidim/admin/utils/_keyframes.scss
@@ -245,16 +263,19 @@ files:
 - app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_strip-unit.scss
 - app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_unitless-rad.scss
 - app/commands/decidim/admin/activate_participatory_process_step.rb
+- app/commands/decidim/admin/close_session_managed_user.rb
 - app/commands/decidim/admin/copy_participatory_process.rb
 - app/commands/decidim/admin/create_attachment.rb
 - app/commands/decidim/admin/create_category.rb
 - app/commands/decidim/admin/create_feature.rb
+- app/commands/decidim/admin/create_managed_user.rb
 - app/commands/decidim/admin/create_newsletter.rb
 - app/commands/decidim/admin/create_participatory_process.rb
 - app/commands/decidim/admin/create_participatory_process_admin.rb
 - app/commands/decidim/admin/create_participatory_process_group.rb
 - app/commands/decidim/admin/create_participatory_process_step.rb
 - app/commands/decidim/admin/create_scope.rb
+- app/commands/decidim/admin/create_scope_type.rb
 - app/commands/decidim/admin/create_static_page.rb
 - app/commands/decidim/admin/deactivate_participatory_process_step.rb
 - app/commands/decidim/admin/deliver_newsletter.rb
@@ -262,6 +283,8 @@ files:
 - app/commands/decidim/admin/destroy_feature.rb
 - app/commands/decidim/admin/destroy_participatory_process_step.rb
 - app/commands/decidim/admin/hide_resource.rb
+- app/commands/decidim/admin/impersonate_managed_user.rb
+- app/commands/decidim/admin/promote_managed_user.rb
 - app/commands/decidim/admin/publish_participatory_process.rb
 - app/commands/decidim/admin/reject_user_group.rb
 - app/commands/decidim/admin/reorder_participatory_process_steps.rb
@@ -278,6 +301,7 @@ files:
 - app/commands/decidim/admin/update_participatory_process_group.rb
 - app/commands/decidim/admin/update_participatory_process_step.rb
 - app/commands/decidim/admin/update_scope.rb
+- app/commands/decidim/admin/update_scope_type.rb
 - app/commands/decidim/admin/update_static_page.rb
 - app/commands/decidim/admin/update_user_groups.rb
 - app/commands/decidim/admin/verify_user_group.rb
@@ -291,6 +315,9 @@ files:
 - app/controllers/decidim/admin/feature_permissions_controller.rb
 - app/controllers/decidim/admin/features/base_controller.rb
 - app/controllers/decidim/admin/features_controller.rb
+- app/controllers/decidim/admin/managed_users/impersonations_controller.rb
+- app/controllers/decidim/admin/managed_users/promotions_controller.rb
+- app/controllers/decidim/admin/managed_users_controller.rb
 - app/controllers/decidim/admin/moderations_controller.rb
 - app/controllers/decidim/admin/newsletters_controller.rb
 - app/controllers/decidim/admin/organization_controller.rb
@@ -303,6 +330,7 @@ files:
 - app/controllers/decidim/admin/participatory_process_steps_controller.rb
 - app/controllers/decidim/admin/participatory_process_user_roles_controller.rb
 - app/controllers/decidim/admin/participatory_processes_controller.rb
+- app/controllers/decidim/admin/scope_types_controller.rb
 - app/controllers/decidim/admin/scopes_controller.rb
 - app/controllers/decidim/admin/static_pages_controller.rb
 - app/controllers/decidim/admin/user_groups_controller.rb
@@ -310,6 +338,9 @@ files:
 - app/forms/decidim/admin/attachment_form.rb
 - app/forms/decidim/admin/category_form.rb
 - app/forms/decidim/admin/feature_form.rb
+- app/forms/decidim/admin/impersonate_managed_user_form.rb
+- app/forms/decidim/admin/managed_user_form.rb
+- app/forms/decidim/admin/managed_user_promotion_form.rb
 - app/forms/decidim/admin/newsletter_form.rb
 - app/forms/decidim/admin/organization_form.rb
 - app/forms/decidim/admin/participatory_process_copy_form.rb
@@ -320,6 +351,7 @@ files:
 - app/forms/decidim/admin/permission_form.rb
 - app/forms/decidim/admin/permissions_form.rb
 - app/forms/decidim/admin/scope_form.rb
+- app/forms/decidim/admin/scope_type_form.rb
 - app/forms/decidim/admin/static_page_form.rb
 - app/helpers/decidim/admin/application_helper.rb
 - app/helpers/decidim/admin/attributes_display_helper.rb
@@ -328,8 +360,10 @@ files:
 - app/helpers/decidim/admin/menu_helper.rb
 - app/helpers/decidim/admin/process_groups_for_select_helper.rb
 - app/helpers/decidim/admin/processes_for_select_helper.rb
+- app/helpers/decidim/admin/scopes_helper.rb
 - app/helpers/decidim/admin/settings_helper.rb
 - app/jobs/decidim/admin/application_job.rb
+- app/jobs/decidim/admin/expire_impersonation_job.rb
 - app/jobs/decidim/admin/newsletter_delivery_job.rb
 - app/jobs/decidim/admin/newsletter_job.rb
 - app/mailers/decidim/admin/application_mailer.rb
@@ -338,6 +372,7 @@ files:
 - app/models/decidim/admin/abilities/participatory_process_admin_ability.rb
 - app/models/decidim/admin/abilities/participatory_process_collaborator_ability.rb
 - app/models/decidim/admin/abilities/participatory_process_moderator_ability.rb
+- app/models/decidim/admin/abilities/user_manager_ability.rb
 - app/models/decidim/admin/application_record.rb
 - app/queries/decidim/admin/process_admins.rb
 - app/queries/decidim/admin/user_groups_evaluation.rb
@@ -362,6 +397,14 @@ files:
 - app/views/decidim/admin/features/edit.html.erb
 - app/views/decidim/admin/features/index.html.erb
 - app/views/decidim/admin/features/new.html.erb
+- app/views/decidim/admin/managed_users/_form.html.erb
+- app/views/decidim/admin/managed_users/impersonations/_form.html.erb
+- app/views/decidim/admin/managed_users/impersonations/index.html.erb
+- app/views/decidim/admin/managed_users/impersonations/new.html.erb
+- app/views/decidim/admin/managed_users/index.html.erb
+- app/views/decidim/admin/managed_users/new.html.erb
+- app/views/decidim/admin/managed_users/promotions/_form.html.erb
+- app/views/decidim/admin/managed_users/promotions/new.html.erb
 - app/views/decidim/admin/moderations/_report.html.erb
 - app/views/decidim/admin/moderations/index.html.erb
 - app/views/decidim/admin/newsletters/_form.html.erb
@@ -391,7 +434,10 @@ files:
 - app/views/decidim/admin/participatory_processes/edit.html.erb
 - app/views/decidim/admin/participatory_processes/index.html.erb
 - app/views/decidim/admin/participatory_processes/new.html.erb
-- app/views/decidim/admin/participatory_processes/show.html.erb
+- app/views/decidim/admin/scope_types/_form.html.erb
+- app/views/decidim/admin/scope_types/edit.html.erb
+- app/views/decidim/admin/scope_types/index.html.erb
+- app/views/decidim/admin/scope_types/new.html.erb
 - app/views/decidim/admin/scopes/_form.html.erb
 - app/views/decidim/admin/scopes/edit.html.erb
 - app/views/decidim/admin/scopes/index.html.erb
@@ -429,6 +475,7 @@ files:
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/nl.yml
+- config/locales/pl.yml
 - config/routes.rb
 - db/migrate/20161102144648_add_admin_participatory_process_user_roles.rb
 - db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb