decidim-admin 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e692aab1c64cc1ef2630d3b30d8265c8dec2b6
-  data.tar.gz: '08ec9a1c6978924342f20e9e61c7efc48c79b28d'
+  metadata.gz: 47c26318821b198a5abef8cc9514114d9be1a543
+  data.tar.gz: b78c4f9d445ee587ffc20fad6cdd935884f8ae2e
 SHA512:
-  metadata.gz: b26e08c17cd13a07f3553e81ef567d892489c152d9ee9b15201908e8afe2e5c326af83bc5e07c1aa2e9ca91c77b5825e64f9676858d4b380275e28fc64b259a0
-  data.tar.gz: f9fe0c60303db75a256a2665eeaf3b8cd167af1608bea107be692b4f9f9862979c27c202937ed5222c4f170ee849b7f3f82ef91537cffd06a8a8561ba8398a9d
+  metadata.gz: dbb45517bed3f266030d3ac5ece8adc8cd387040bf34def83bc72bebde4eb6457d989ac6d591a7d42fc08264251b40a2d626a0f03c868ab6ef3af0f7b9680c20
+  data.tar.gz: 0e26714cb55d3f073cf0dbeb58584d2413016b2fbb9edd49fcf861bd9e0d2737f73a252334c2b1f853fb8c4c2b1457d9f6fe49824d05958eabc6b8b5b1d98b0c

data/app/assets/stylesheets/decidim/admin/extra/_label-required.scss

@@ -0,0 +1,3 @@
+.label-required {
+  margin-left: 5px;
+}

data/app/assets/stylesheets/decidim/admin/extra/_title_bar.scss

@@ -2,4 +2,60 @@
   a.logo {
     color: #fff;
   }
-}
+  @include breakpoint(smallmedium down){
+    border-top: 2.125rem solid darken($dark-gray, 15%);
+  }
+}
+
+.tool-bar{
+  text-align: right;
+  position: absolute;
+  right: 2rem;
+  vertical-align: middle;
+  @include breakpoint(smallmedium down){
+    position: initial;
+  }
+  .user-login{
+    vertical-align: middle;
+    position: initial;
+    text-align: left;
+    display: inline-block;
+    margin-top: 0px;
+    @include breakpoint(smallmedium down){
+      position: absolute;
+      right: 2rem;
+      margin-top: -1.2rem;
+    }
+  }
+  .language-choose{
+    position: initial;
+    vertical-align: middle;
+    text-align: left;
+    display: inline-block;
+    vertical-align: middle;
+    .is-dropdown-submenu-parent a{
+      color: #fff;
+      &:after{
+        border-color: #fff transparent transparent !important;
+      }
+    }
+    .is-dropdown-submenu li > a {
+      color: $dark-gray;
+      &:hover{
+        background-color: lighten($medium-gray, 30%)
+      }
+    }
+    @include breakpoint(smallmedium down){
+      font-size: .8rem;
+      position: absolute;
+      top: -2.2rem;
+      left: .5rem;
+      margin-left: 0;
+      .dropdown.menu > li.is-dropdown-submenu-parent > a::after{
+        border-width: 3px;
+        right: 10px;
+        margin-top: 0;
+      }
+    }
+  }
+}

data/app/commands/decidim/admin/create_participatory_process_admin.rb

@@ -24,9 +24,12 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if form.invalid?
-        return broadcast(:invalid) unless user
 
-        create_role
+        ActiveRecord::Base.transaction do
+          create_or_invite_user
+          create_role
+        end
+
         broadcast(:ok)
       rescue ActiveRecord::RecordInvalid
         form.errors.add(:email, :taken)
@@ -35,21 +38,39 @@ module Decidim
 
       private
 
-      attr_reader :form, :participatory_process, :current_user
+      attr_reader :form, :participatory_process, :current_user, :user
 
       def create_role
-        ParticipatoryProcessUserRole.create!(
+        ParticipatoryProcessUserRole.find_or_create_by!(
           role: form.role.to_sym,
           user: user,
           participatory_process: @participatory_process
         )
       end
 
-      def user
-        @user ||= User.where(
+      def create_or_invite_user
+        @user ||= existing_user || new_user
+      end
+
+      def existing_user
+        return @existing_user if defined?(@existing_user)
+
+        @existing_user = User.where(
           email: form.email,
           organization: participatory_process.organization
-        ).first || InviteUser.call(user_form) do
+        ).first
+
+        if @existing_user && !@existing_user.invitation_accepted?
+          InviteUserAgain.call(@existing_user, invitation_instructions)
+        end
+
+        @existing_user
+      end
+
+      def new_user
+        new_user_form = user_form.dup
+        new_user_form.roles = []
+        @new_user ||= InviteUser.call(new_user_form) do
           on(:ok) do |user|
             return user
           end

data/app/commands/decidim/admin/create_participatory_process_step.rb

@@ -38,7 +38,8 @@ module Decidim
           description: form.description,
           start_date: form.start_date,
           end_date: form.end_date,
-          participatory_process: @participatory_process
+          participatory_process: @participatory_process,
+          active: @participatory_process.steps.empty?
         )
       end
     end

data/app/commands/decidim/admin/destroy_participatory_process_step.rb

@@ -19,8 +19,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid, :last_step) if @participatory_process.steps.count == 1
-        return broadcast(:invalid, :active_step) if @step.active?
+        return broadcast(:invalid, :active_step) if active_step?
 
         @step.destroy!
         reorder_steps
@@ -29,6 +28,10 @@ module Decidim
 
       private
 
+      def active_step?
+        @participatory_process.steps.count > 1 && @step.active?
+      end
+
       def reorder_steps
         steps = @participatory_process.steps.reload
 

data/app/commands/decidim/admin/update_feature.rb

@@ -36,6 +36,7 @@ module Decidim
         @feature.update_attributes(
           name: form.name,
           settings: form.settings,
+          default_step_settings: form.default_step_settings,
           step_settings: form.step_settings,
           weight: form.weight
         )

data/app/commands/decidim/admin/update_organization.rb

@@ -53,12 +53,17 @@ module Decidim
           github_handler: form.github_handler,
           description: form.description,
           welcome_text: form.welcome_text,
-          homepage_image: form.homepage_image || organization.homepage_image,
-          logo: form.logo || organization.logo,
-          favicon: form.favicon || organization.favicon,
+          homepage_image: form.homepage_image,
+          remove_homepage_image: form.remove_homepage_image,
+          logo: form.logo,
+          remove_logo: form.remove_logo,
+          favicon: form.favicon,
+          remove_favicon: form.remove_favicon,
           default_locale: form.default_locale,
-          official_img_header: form.official_img_header || organization.official_img_header,
-          official_img_footer: form.official_img_footer || organization.official_img_footer,
+          official_img_header: form.official_img_header,
+          remove_official_img_header: form.remove_official_img_header,
+          official_img_footer: form.official_img_footer,
+          remove_official_img_footer: form.remove_official_img_footer,
           official_url: form.official_url,
           show_statistics: form.show_statistics
         }

data/app/commands/decidim/admin/update_participatory_process.rb

@@ -48,8 +48,10 @@ module Decidim
           subtitle: form.subtitle,
           slug: form.slug,
           hashtag: form.hashtag,
-          hero_image: form.hero_image || participatory_process.hero_image,
-          banner_image: form.banner_image || participatory_process.banner_image,
+          hero_image: form.hero_image,
+          remove_hero_image: form.remove_hero_image,
+          banner_image: form.banner_image,
+          remove_banner_image: form.remove_banner_image,
           promoted: form.promoted,
           description: form.description,
           short_description: form.short_description,

data/app/controllers/decidim/admin/application_controller.rb

@@ -9,6 +9,7 @@ module Decidim
       include FormFactory
       include LocaleSwitcher
       include PayloadInfo
+
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
       helper Decidim::Admin::FeatureSettingsHelper
@@ -21,6 +22,7 @@ module Decidim
       helper Decidim::OrganizationScopesHelper
       helper Decidim::TranslationsHelper
       helper Decidim::LanguageChooserHelper
+      helper Decidim::FeaturePathHelper
 
       protect_from_forgery with: :exception, prepend: true
 

data/app/controllers/decidim/admin/concerns/has_attachments.rb

@@ -54,7 +54,7 @@ module Decidim
           def update
             @attachment = collection.find(params[:id])
             authorize! :update, authorization_object
-            @form = form(AttachmentForm).from_params(params)
+            @form = form(AttachmentForm).from_params(attachment_params)
 
             UpdateAttachment.call(@attachment, @form) do
               on(:ok) do
@@ -110,6 +110,15 @@ module Decidim
           def collection
             @collection ||= attached_to.attachments
           end
+
+          private
+
+          def attachment_params
+            {
+              id: params[:id],
+              file: @attachment.file
+            }.merge(params[:attachment].to_unsafe_h)
+          end
         end
       end
     end

data/app/controllers/decidim/admin/concerns/participatory_process_admin.rb

@@ -11,7 +11,6 @@ module Decidim
 
         included do
           helper_method :participatory_process
-          before_action :ensure_participatory_process
 
           layout "decidim/admin/participatory_process"
         end
@@ -22,10 +21,6 @@ module Decidim
           @participatory_process ||=
             current_organization.participatory_processes.find(params[:participatory_process_id])
         end
-
-        def ensure_participatory_process
-          raise ActionController::RoutingError, "Not Found" unless participatory_process
-        end
       end
     end
   end

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

@@ -8,7 +8,6 @@ module Decidim
       class BaseController < Admin::ApplicationController
         skip_authorize_resource
         include Concerns::ParticipatoryProcessAdmin
-        include NeedsParticipatoryProcess
         include FeatureSettings
 
         helper Decidim::Admin::ExportsHelper

data/app/controllers/decidim/admin/moderations_controller.rb

@@ -48,17 +48,20 @@ module Decidim
 
       def moderations
         @moderations ||= begin
-          moderations = Decidim::Moderation.where(participatory_process: participatory_process)
           if params[:hidden]
-            moderations.where.not(hidden_at: nil)
+            participatory_process_moderations.where.not(hidden_at: nil)
           else
-            moderations.where(hidden_at: nil)
+            participatory_process_moderations.where(hidden_at: nil)
           end
         end
       end
 
       def reportable
-        @reportable ||= Decidim::Moderation.where(participatory_process: participatory_process).find(params[:id]).reportable
+        @reportable ||= participatory_process_moderations.find(params[:id]).reportable
+      end
+
+      def participatory_process_moderations
+        @participatory_process_moderations ||= Decidim::Moderation.where(participatory_process: participatory_process)
       end
     end
   end

data/app/controllers/decidim/admin/organization_controller.rb

@@ -16,7 +16,7 @@ module Decidim
 
       def update
         authorize! :update, current_organization
-        @form = form(OrganizationForm).from_params(form_params)
+        @form = form(OrganizationForm).from_params(organization_params)
 
         UpdateOrganization.call(current_organization, @form) do
           on(:ok) do
@@ -33,10 +33,16 @@ module Decidim
 
       private
 
-      def form_params
+      def organization_params
         params[:organization] ||= {}
         params[:organization][:id] ||= current_organization.id
-        params
+        {
+          homepage_image: current_organization.homepage_image,
+          logo: current_organization.logo,
+          favicon: current_organization.favicon,
+          official_img_header: current_organization.official_img_header,
+          official_img_footer: current_organization.official_img_footer
+        }.merge(params[:organization].to_unsafe_h)
       end
     end
   end

data/app/controllers/decidim/admin/participatory_process_user_roles_controller.rb

@@ -70,6 +70,23 @@ module Decidim
         redirect_to participatory_process_user_roles_path(@participatory_process_user_role.participatory_process)
       end
 
+      def resend_invitation
+        @user_role = collection.find(params[:id])
+        authorize! :invite, @user_role
+
+        InviteUserAgain.call(@user_role.user, "invite_admin") do
+          on(:ok) do
+            flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
+          end
+        end
+
+        redirect_to participatory_process_user_roles_path(participatory_process)
+      end
+
       private
 
       def collection

data/app/controllers/decidim/admin/participatory_processes_controller.rb

@@ -27,7 +27,7 @@ module Decidim
         CreateParticipatoryProcess.call(@form) do
           on(:ok) do |participatory_process|
             flash[:notice] = I18n.t("participatory_processes.create.success", scope: "decidim.admin")
-            redirect_to edit_participatory_process_path(participatory_process)
+            redirect_to participatory_process_steps_path(participatory_process)
           end
 
           on(:invalid) do
@@ -47,7 +47,7 @@ module Decidim
       def update
         @participatory_process = collection.find(params[:id])
         authorize! :update, @participatory_process
-        @form = form(ParticipatoryProcessForm).from_params(params)
+        @form = form(ParticipatoryProcessForm).from_params(participatory_process_params)
 
         UpdateParticipatoryProcess.call(@participatory_process, @form) do
           on(:ok) do |participatory_process|
@@ -57,7 +57,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("participatory_processes.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, layout: "decidim/admin/participatory_process"
           end
         end
       end
@@ -88,6 +88,14 @@ module Decidim
       def collection
         @collection ||= ManageableParticipatoryProcessesForUser.for(current_user)
       end
+
+      def participatory_process_params
+        {
+          id: params[:id],
+          hero_image: @participatory_process.hero_image,
+          banner_image: @participatory_process.banner_image
+        }.merge(params[:participatory_process].to_unsafe_h)
+      end
     end
   end
 end

data/app/forms/decidim/admin/feature_form.rb

@@ -14,6 +14,7 @@ module Decidim
       validates :name, translatable_presence: true
 
       attribute :settings, Object
+      attribute :default_step_settings, Object
       attribute :manifest
       attribute :weight, Integer, default: 0
 
@@ -23,12 +24,17 @@ module Decidim
       def map_model(model)
         self.attributes = model.attributes
         self.settings = model.settings
+        self.default_step_settings = model.default_step_settings
       end
 
       def settings?
         settings.manifest.attributes.any?
       end
 
+      def default_step_settings?
+        default_step_settings.manifest.attributes.any?
+      end
+
       def step_settings?
         return false unless participatory_process.steps.any?
 

data/app/forms/decidim/admin/organization_form.rb

@@ -19,11 +19,16 @@ module Decidim
       attribute :github_handler, String
       attribute :default_locale, String
       attribute :homepage_image
+      attribute :remove_homepage_image
       attribute :logo
+      attribute :remove_logo
       attribute :favicon
+      attribute :remove_favicon
       attribute :official_url
       attribute :official_img_header
+      attribute :remove_official_img_header
       attribute :official_img_footer
+      attribute :remove_official_img_footer
       attribute :show_statistics
 
       translatable_attribute :description, String