decidim-core 0.4.4 → 0.5.0

data/app/assets/stylesheets/decidim/modules/_pagination.scss

@@ -2,4 +2,4 @@
   .pagination-previous, .pagination-next {
     display: inline-block;
   }
-}
+}

data/app/assets/stylesheets/decidim/modules/_process-info.scss

@@ -41,4 +41,4 @@ $gutter-medium: map-get($grid-column-gutter, medium);
     margin-right: calc(-50% - #{$container-padding-2x} - #{$gutter-medium}/2);
     width: 80%;
   }
-}
+}

data/app/assets/stylesheets/decidim/modules/_reference.scss

@@ -3,4 +3,4 @@
   font-size: .9rem;
   text-align: center;
   margin-bottom: 1rem;
-}
+}

data/app/assets/stylesheets/decidim/modules/_reveal.scss

@@ -17,4 +17,4 @@
 
 .reveal__title{
   margin-top: -6px;
-}
+}

data/app/assets/stylesheets/decidim/modules/_signup.scss

@@ -36,4 +36,4 @@
   legend{
     margin-bottom: 1rem;
   }
-}
+}

data/app/assets/stylesheets/decidim/modules/_static-pages.scss

@@ -43,4 +43,4 @@
 
 .static__message__cta{
   margin-top: 2rem;
-}
+}

data/app/assets/stylesheets/decidim/modules/_tags.scss

@@ -26,4 +26,4 @@ $tags-border: $border;
 
 .tags--inline{
   display: inline;
-}
+}

data/app/assets/stylesheets/decidim/modules/_title-action.scss

@@ -25,4 +25,4 @@
     height: 11px;
     margin-left: .3rem;
   }
-}
+}

data/app/assets/stylesheets/decidim/modules/_user-form.scss

@@ -11,4 +11,4 @@
 
 .user-form__label{
   font-weight: 600;
-}
+}

data/app/assets/stylesheets/decidim/modules/_video.scss

@@ -15,4 +15,4 @@
   width: 100%;
   height: 100%;
   border: none;
-}
+}

data/app/assets/stylesheets/decidim/plugins/_select2.scss

@@ -0,0 +1,63 @@
+.select2-container--focus .select2-selection {
+  border: 1px solid $primary !important;
+}
+.select2-container {
+  &.select2 {
+    margin-bottom: 1.5rem;
+  }
+  .select2-dropdown {
+    box-shadow: inset 0 -1px 2px rgba(26, 24, 29, 0.1);
+    border-color: #eee;
+    .select2-search__field {
+      margin-bottom: 0;
+    }
+  }
+  .select2-selection {
+    box-shadow: inset 0 1px 2px rgba(26, 24, 29, 0.1);
+    border-color: #eee;
+  }
+  .select2-selection--single {
+    margin-top: 5px;
+    height: 48px;
+    .select2-selection__rendered {
+      line-height: 46px;
+      padding-right: 23px;
+      font-weight: normal;
+      color: #1a181d;
+    }
+    .select2-selection__arrow {
+      height: 54px;
+      right: 5px;
+      b {
+        border-width: 6px 5px 0 5px;
+        border-top-color: #121014;
+      }
+    }
+  }
+  .select2-selection--multiple {
+    .select2-selection__rendered li {
+      border: 1px solid #e8e8e8;
+      padding: 0 .5rem;
+      color: $secondary;
+      background: none;
+      border-radius: 0;
+      font-size: 0.9rem;
+      &.select2-search {
+        clear: left;
+        padding: 0;
+        border: none;
+        .select2-search__field {
+          width: 100% !important;
+          padding: 0.2rem;
+          height: 1.75rem;
+          margin: 0.2rem 0 0;
+          font-size: 1rem;
+        }
+      }
+    }
+  }
+}
+.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-width: 0 5px 6px 5px;
+  border-bottom-color: #121014;
+}

data/app/assets/stylesheets/decidim/utils/_toggle-expand.scss

@@ -5,4 +5,4 @@
   &.is-expanded{
     display: block;
   }
-}
+}

data/app/commands/decidim/invite_user.rb

@@ -31,7 +31,9 @@ module Decidim
     end
 
     def update_user
-      user.admin = form.admin
+      user.admin = form.role == "admin"
+      user.roles << form.role if form.role != "admin"
+      user.roles = user.roles.uniq
       user.save!
     end
 
@@ -40,7 +42,8 @@ module Decidim
         name: form.name,
         email: form.email.downcase,
         organization: form.organization,
-        admin: form.admin,
+        admin: form.role == "admin",
+        roles: form.role == "admin" ? [] : [form.role],
         comments_notifications: true,
         replies_notifications: true
       )

data/app/controllers/concerns/decidim/devise_controllers.rb

@@ -26,5 +26,11 @@ module Decidim
 
       layout "layouts/decidim/application"
     end
+
+    # 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

data/app/controllers/concerns/decidim/impersonate_users.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # Shared behaviour for controllers that need user impersonation logic.
+  module ImpersonateUsers
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :check_impersonation_log_expired
+
+      helper_method :impersonation_session_ends_at, :impersonation_session_remaining_duration_in_minutes
+
+      alias_method :real_user, :current_user
+
+      # Returns a manager user if the real user has an active impersonation
+      def current_user
+        managed_user || real_user
+      end
+
+      def impersonation_session_ends_at
+        @impersonation_session_ends_at ||= impersonation_log.started_at + Decidim::ImpersonationLog::SESSION_TIME_IN_MINUTES.minutes
+      end
+
+      def impersonation_session_remaining_duration_in_minutes
+        ((impersonation_session_ends_at - Time.current) / 60).round
+      end
+
+      private
+
+      # Returns the managed user impersonated by an admin if exists
+      def managed_user
+        return unless can_impersonate_users?
+        impersonation_log&.user
+      end
+
+      # Check if the active impersonation session has expired or not.
+      def check_impersonation_log_expired
+        return unless can_impersonate_users? && impersonation_log
+
+        if impersonation_log.expired?
+          impersonation_log.ended_at = Time.current
+          impersonation_log.save!
+          flash[:alert] = I18n.t("managed_users.expired_session", scope: "decidim")
+          redirect_to decidim_admin.managed_users_path
+        end
+      end
+
+      # Gets the ability instance for the real user logged in.
+      def real_ability
+        @real_ability ||= current_ability_klass.new(real_user, ability_context)
+      end
+
+      def can_impersonate_users?
+        real_user && real_ability.can?(:impersonate, :managed_users)
+      end
+
+      def impersonation_log
+        @impersonation_log ||= Decidim::ImpersonationLog
+                               .where(admin: real_user)
+                               .active
+                               .first
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/needs_authorization.rb

@@ -21,10 +21,6 @@ module Decidim
         @current_ability ||= current_ability_klass.new(current_user, ability_context)
       end
 
-      def current_ability_klass
-        Decidim::Abilities::BaseAbility
-      end
-
       def ability_context
         {
           current_settings: try(:current_settings),

data/app/controllers/decidim/application_controller.rb

@@ -7,6 +7,7 @@ module Decidim
     include LocaleSwitcher
     include NeedsAuthorization
     include PayloadInfo
+    include ImpersonateUsers
 
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper
@@ -45,5 +46,11 @@ module Decidim
     def add_vary_header
       response.headers["Vary"] = "Accept"
     end
+
+    # 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

data/app/controllers/decidim/devise/invitations_controller.rb

@@ -18,6 +18,13 @@ module Decidim
       def after_accept_path_for(resource)
         params[:invite_redirect] || after_sign_in_path_for(resource)
       end
+
+      # When a managed user accepts the invitation is promoted to non-managed user.
+      def accept_resource
+        resource = resource_class.accept_invitation!(update_resource_params)
+        resource.update_attribute(:managed, false) if resource.managed?
+        resource
+      end
     end
   end
 end

data/app/controllers/decidim/errors_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  class ErrorsController < ApplicationController
+  class ErrorsController < Decidim::ApplicationController
     skip_authorization_check
 
     def not_found

data/app/controllers/decidim/features/base_controller.rb

@@ -18,7 +18,7 @@ module Decidim
       helper Decidim::ParticipatoryProcessHelper
       helper Decidim::IconHelper
       helper Decidim::ResourceHelper
-      helper Decidim::OrganizationScopesHelper
+      helper Decidim::ScopesHelper
       helper Decidim::ActionAuthorizationHelper
       helper Decidim::AttachmentsHelper
 

data/app/controllers/decidim/participatory_process_widgets_controller.rb

@@ -2,8 +2,6 @@
 
 module Decidim
   class ParticipatoryProcessWidgetsController < Decidim::WidgetsController
-    helper_method :model
-
     private
 
     def model

data/app/controllers/decidim/scopes_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Exposes the scopes text search so users can choose a scope writing its name.
+  class ScopesController < Decidim::ApplicationController
+    def search
+      authorize! :search, Scope
+      root = Scope.where(id: params[:root], organization: current_organization).first
+      scopes = if params[:term].present?
+                 FreetextScopes.for(current_organization, I18n.locale, params[:term], root)
+               elsif root
+                 root.children
+               else
+                 current_organization.top_scopes
+               end
+      root_option = if params[:include_root] == "true" && !params[:term].present?
+                      if root
+                        [{ id: root.id.to_s, text: root.name[I18n.locale.to_s] }]
+                      else
+                        [{ id: "global", text: I18n.t("decidim.scopes.global") }]
+                      end
+                    else
+                      []
+                    end
+
+      render json: { results: root_option + scopes.map { |scope| { id: scope.id.to_s, text: scope.name[I18n.locale.to_s] } } }
+    end
+  end
+end

data/app/forms/decidim/attachment_form.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A form object used to create attachments.
+  #
+  class AttachmentForm < Form
+    attribute :title, String
+    attribute :file
+
+    mimic :attachment
+
+    validates :title, presence: true, if: ->(form) { form.file.present? }
+  end
+end

data/app/forms/decidim/invite_user_form.rb

@@ -11,9 +11,11 @@ module Decidim
     attribute :invitation_instructions, String
     attribute :organization, Decidim::Organization
     attribute :invited_by, Decidim::User
-    attribute :admin, Boolean
+    attribute :role, String
 
     validates :email, :name, :organization, :invitation_instructions, presence: true
+    validates :role, inclusion: { in: Decidim::User::ROLES }
+
     validate :admin_uniqueness
 
     def email
@@ -28,6 +30,15 @@ module Decidim
       super || current_user
     end
 
+    def available_roles_for_select
+      Decidim::User::ROLES.map do |role|
+        [
+          I18n.t(role, scope: "decidim.admin.models.user.fields.roles"),
+          role
+        ]
+      end
+    end
+
     private
 
     def admin_uniqueness

data/app/helpers/decidim/application_helper.rb

@@ -4,6 +4,7 @@ module Decidim
   # Main module to add application-wide helpers.
   module ApplicationHelper
     include Decidim::OmniauthHelper
+    include Decidim::ScopesHelper
 
     # Truncates a given text respecting its HTML tags.
     #

data/app/helpers/decidim/attachments_helper.rb

@@ -12,5 +12,16 @@ module Decidim
     def attachments_for(attached_to)
       render partial: "attachments", locals: { attached_to: attached_to }
     end
+
+    # Renders the attachment's title.
+    # Checks if the attachment's title is translated or not and use
+    # the correct render method.
+    #
+    # attachment - An Attachment object
+    #
+    # Returns String.
+    def attachment_title(attachment)
+      attachment.title.is_a?(Hash) ? translated_attribute(attachment.title) : attachment.title
+    end
   end
 end

data/app/helpers/decidim/decidim_form_helper.rb

@@ -57,21 +57,22 @@ module Decidim
     def translated_field_tag(type, object_name, name, value = {}, options = {})
       locales = available_locales
 
-      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs"
-      enabled_tabs = options[:enable_tabs].nil? ? true : options[:enable_tabs]
-      tabs_panels_data = enabled_tabs ? { tabs: true } : {}
+      field_label = label_tag(name, options[:label])
 
       if locales.count == 1
-        return send(
+        field_input = send(
           type,
-          "#{name}_#{locales.first.to_s.gsub("-", "__")}",
-          options.merge(label: options[:label])
+          "#{name}_#{locales.first.to_s.gsub("-", "__")}"
         )
+
+        return safe_join [field_label, field_input]
       end
 
-      label_tabs = content_tag(:div, class: "label--tabs") do
-        field_label = label_tag(name, options[:label])
+      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs"
+      enabled_tabs = options[:enable_tabs].nil? ? true : options[:enable_tabs]
+      tabs_panels_data = enabled_tabs ? { tabs: true } : {}
 
+      label_tabs = content_tag(:div, class: "label--tabs") do
         tabs_panels = "".html_safe
         if options[:label] != false
           tabs_panels = content_tag(:ul, class: "tabs tabs--lang", id: tabs_id, data: tabs_panels_data) do