decidim 0.4.4 → 0.5.0

data/decidim-admin/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/decidim-admin/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/decidim-admin/config/locales/pl.yml

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

data/decidim-admin/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/decidim-admin/decidim-admin.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails", "~> 4.3.1"
   s.add_dependency "foundation_rails_helper", "~> 3.0.0.rc"
   s.add_dependency "active_link_to", "~> 1.0.0"
+  s.add_dependency "select2-rails", "~> 4.0.3"
 
   s.add_development_dependency "decidim-dev", Decidim.version
 end

data/decidim-admin/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/decidim-admin/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

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::CloseSessionManagedUser do
+  let(:organization) { create :organization }
+  let(:current_user) { create :user, :admin, organization: organization }
+  let(:user) { create :user, :managed, organization: organization }
+  let!(:impersonation_log) { create(:impersonation_log, admin: current_user, user: user) }
+
+  subject { described_class.new(user, current_user) }
+
+  context "when everything is ok" do
+    it "broadcasts ok" do
+      expect { subject.call }.to broadcast(:ok)
+    end
+
+    it "ends the impersonation log" do
+      subject.call
+      expect(impersonation_log.reload).to be_ended
+    end
+  end
+
+  context "when there is no active session for this admin and user" do
+    before do
+      impersonation_log.update_attributes(ended_at: Time.current)
+    end
+
+    it "broadcasts invalid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ require "spec_helper"
 
 module Decidim
   module Admin
-    describe CreateCategory, :db do
+    describe CreateCategory do
       describe "call" do
         let(:organization) { create(:organization) }
         let(:participatory_process) { create :participatory_process, organization: organization }

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

@@ -20,6 +20,12 @@ module Decidim
             dummy_global_attribute_1: true,
             dummy_global_attribute_2: false
           },
+          default_step_settings: {
+            step.id.to_s => {
+              dummy_step_attribute_1: true,
+              dummy_step_attribute_2: false
+            }
+          },
           step_settings: {
             step.id.to_s => {
               dummy_step_attribute_1: true,

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe CreateManagedUser do
+      describe "call" do
+        let(:available_authorizations) { ["Decidim::DummyAuthorizationHandler"] }
+        let(:organization) { create(:organization, available_authorizations: available_authorizations) }
+        let(:document_number) { "12345678X" }
+        let(:form_params) do
+          {
+            name: "Foo",
+            authorization: {
+              handler_name: "Decidim::DummyAuthorizationHandler",
+              document_number: document_number
+            }
+          }
+        end
+        let(:form) do
+          ManagedUserForm.from_params(
+            form_params
+          ).with_context(
+            current_organization: organization
+          )
+        end
+        let(:command) { described_class.new(form) }
+
+        describe "when the form is not valid" do
+          before do
+            expect(form).to receive(:invalid?).and_return(true)
+          end
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+
+          it "doesn't create a user" do
+            expect do
+              command.call
+            end.not_to change { User.count }
+          end
+        end
+
+        describe "when the form is valid" do
+          it "broadcasts ok" do
+            expect { command.call }.to broadcast(:ok)
+          end
+
+          it "creates a managed user" do
+            expect do
+              command.call
+            end.to change { User.count }.by(1)
+
+            user = Decidim::User.last
+            expect(user).to be_managed
+          end
+
+          it "authorizes the user" do
+            expect(AuthorizeUser).to receive(:call).with(form.authorization)
+            command.call
+          end
+        end
+      end
+    end
+  end
+end