decidim-admin 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ccb01ac339fc58733de0b80646a81932272c0f8
-  data.tar.gz: 4e28efb0072d97e8e479dfa5efd2184a83187ace
+  metadata.gz: d1eef3366bf3923dc3a182dd47ded1793fc4e45f
+  data.tar.gz: 3703c4263bd73e9636c2b6b6299667483282def8
 SHA512:
-  metadata.gz: eb4b47d84eaf6f6f17e0c53db999b54582af2a63b638d50d063e323e432cbe49cbea3474890c0736569c287eb02ff7ee61e3e38782b0648bbbcefbaa14704036
-  data.tar.gz: 3b0979b25627ee94a5f2d6b4182a360797f34bbe041973ba3e6a9d850e08c566a4ba57a61371029f7187c4c575e3818d8353a33a86ff21c3d475eb07ed16c8b6
+  metadata.gz: 952ea7070267a85a63cfd0d2b5622d4743eade8be84d749e6e21131a4ae7f1d58157a481c05dfaf4d5b1730dcff9def21a373879a55f8cbb4333ed8b73c5f0dc
+  data.tar.gz: 76a770ac9c0585b06043ce084326d5cf0d614bf400f06ea70f520a666ea8d3194333c4889557055ba647b46c886519c46add8219e34f07586826470c8400c76a

data/app/assets/stylesheets/decidim/admin/modules/_table-list.scss

@@ -1,5 +1,6 @@
 //Override Foundation defaults
 .table-scroll table{
+  border-collapse: unset;
   width: 100%;
 }
 

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

@@ -20,7 +20,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) unless impersonation_log.present?
+        return broadcast(:invalid) if impersonation_log.blank?
 
         close_session
 

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

@@ -26,7 +26,7 @@ module Decidim
       private
 
       def reject_user_group
-        @user_group.update_attributes(rejected_at: Time.current, verified_at: nil)
+        @user_group.update_attributes!(rejected_at: Time.current, verified_at: nil)
       end
     end
   end

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

@@ -33,7 +33,7 @@ module Decidim
       private
 
       def update_feature
-        @feature.update_attributes(
+        @feature.update_attributes!(
           name: form.name,
           settings: form.settings,
           default_step_settings: form.default_step_settings,

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

@@ -23,15 +23,8 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        update_organization
-
-        if @organization.valid?
-          broadcast(:ok, @organization)
-        else
-          form.errors.add(:official_img_header, @organization.errors[:official_img_header]) if @organization.errors.include? :official_img_header
-          form.errors.add(:official_img_footer, @organization.errors[:official_img_footer]) if @organization.errors.include? :official_img_footer
-          broadcast(:invalid)
-        end
+        return broadcast(:ok, @organization) if update_organization
+        broadcast(:invalid)
       end
 
       private
@@ -46,27 +39,13 @@ module Decidim
       def attributes
         {
           name: form.name,
+          default_locale: form.default_locale,
+          reference_prefix: form.reference_prefix,
           twitter_handler: form.twitter_handler,
           facebook_handler: form.facebook_handler,
           instagram_handler: form.instagram_handler,
           youtube_handler: form.youtube_handler,
-          github_handler: form.github_handler,
-          description: form.description,
-          welcome_text: form.welcome_text,
-          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,
-          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,
-          header_snippets: form.header_snippets,
-          show_statistics: form.show_statistics
+          github_handler: form.github_handler
         }
       end
     end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A command with all the business logic for updating the current
+    # organization appearance.
+    class UpdateOrganizationAppearance < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # organization - The Organization that will be updated.
+      # form - A form object with the params.
+      def initialize(organization, form)
+        @organization = organization
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        update_organization
+
+        if @organization.valid?
+          broadcast(:ok, @organization)
+        else
+          form.errors.add(:official_img_header, @organization.errors[:official_img_header]) if @organization.errors.include? :official_img_header
+          form.errors.add(:official_img_footer, @organization.errors[:official_img_footer]) if @organization.errors.include? :official_img_footer
+          broadcast(:invalid)
+        end
+      end
+
+      private
+
+      attr_reader :form, :organization
+
+      def update_organization
+        @organization.assign_attributes(attributes)
+        @organization.save! if @organization.valid?
+      end
+
+      def attributes
+        {
+          cta_button_path: form.cta_button_path,
+          cta_button_text: form.cta_button_text,
+          description: form.description,
+          welcome_text: form.welcome_text,
+          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,
+          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
+        }.tap do |attributes|
+          if Decidim.enable_html_header_snippets
+            attributes[:header_snippets] = form.header_snippets
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,7 +25,7 @@ module Decidim
       private
 
       def verify_user_group
-        @user_group.update_attributes(verified_at: Time.current, rejected_at: nil)
+        @user_group.update_attributes!(verified_at: Time.current, rejected_at: nil)
       end
     end
   end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows managing the appearance of the organization.
+    class OrganizationAppearanceController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/settings"
+
+      def edit
+        authorize! :update, current_organization
+        @form = form(OrganizationAppearanceForm).from_model(current_organization)
+      end
+
+      def update
+        authorize! :update, current_organization
+        @form = form(OrganizationAppearanceForm).from_params(params)
+
+        UpdateOrganizationAppearance.call(current_organization, @form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("organization.update.success", scope: "decidim.admin")
+            redirect_to edit_organization_appearance_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("organization.update.error", scope: "decidim.admin")
+            render :edit
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module Decidim
 
       def update
         authorize! :update, current_organization
-        @form = form(OrganizationForm).from_params(organization_params)
+        @form = form(OrganizationForm).from_params(params)
 
         UpdateOrganization.call(current_organization, @form) do
           on(:ok) do
@@ -28,20 +28,6 @@ module Decidim
           end
         end
       end
-
-      private
-
-      def organization_params
-        params[:organization] ||= {}
-        params[:organization][:id] ||= current_organization.id
-        {
-          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
 end

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

@@ -73,12 +73,12 @@ module Decidim
 
       def parent_scope
         return @parent_scope if defined?(@parent_scope)
-        @parent_scope = scope ? scope.parent : organization_scopes.find_by_id(params[:scope_id])
+        @parent_scope = scope ? scope.parent : organization_scopes.find_by(id: params[:scope_id])
       end
 
       def scope
         return @scope if defined?(@scope)
-        @scope = organization_scopes.find_by_id(params[:id])
+        @scope = organization_scopes.find_by(id: params[:id])
       end
 
       def children_scopes

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

@@ -84,7 +84,7 @@ module Decidim
       end
 
       def page
-        @page ||= collection.find_by_slug(params[:id])
+        @page ||= collection.find_by(slug: params[:id])
       end
 
       def collection

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A form object used to update the current organization appearance from the admin
+    # dashboard.
+    #
+    class OrganizationAppearanceForm < Form
+      include TranslatableAttributes
+
+      mimic :organization_appearance
+
+      attribute :homepage_image
+      attribute :remove_homepage_image
+      attribute :logo
+      attribute :remove_logo
+      attribute :favicon
+      attribute :remove_favicon
+      attribute :official_img_header
+      attribute :remove_official_img_header
+      attribute :official_img_footer
+      attribute :remove_official_img_footer
+      attribute :official_url
+      attribute :show_statistics, Boolean
+      attribute :header_snippets, String
+      attribute :cta_button_path, String
+
+      translatable_attribute :cta_button_text, String
+      translatable_attribute :description, String
+      translatable_attribute :welcome_text, String
+
+      validates :cta_button_path, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9-/]+\z} }, allow_blank: true
+      validates :official_img_header,
+                :official_img_footer,
+                :homepage_image,
+                :logo,
+                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+                file_content_type: { allow: ["image/jpeg", "image/png"] }
+    end
+  end
+end

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

@@ -18,34 +18,11 @@ module Decidim
       attribute :youtube_handler, String
       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
-      attribute :header_snippets, String
-
-      translatable_attribute :description, String
-      translatable_attribute :welcome_text, String
 
       validates :name, presence: true
       validates :default_locale, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
 
-      validates :official_img_header,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] }
-      validates :official_img_footer,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] }
-
       private
 
       def available_locales

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

@@ -21,13 +21,14 @@ module Decidim
       alias organization current_organization
 
       def scope_type
-        Decidim::ScopeType.find_by_id(scope_type_id) if scope_type_id
+        Decidim::ScopeType.find_by(id: scope_type_id) if scope_type_id
       end
 
       private
 
       def code_uniqueness
-        return unless organization && organization.scopes.where(code: code).where.not(id: id).any?
+        return unless organization
+        return unless organization.scopes.where(code: code).where.not(id: id).any?
 
         errors.add(:code, :taken)
       end

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

@@ -27,7 +27,8 @@ module Decidim
       private
 
       def slug_uniqueness
-        return unless organization && organization.static_pages.where(slug: slug).where.not(id: id).any?
+        return unless organization
+        return unless organization.static_pages.where(slug: slug).where.not(id: id).any?
 
         errors.add(:slug, :taken)
       end

data/app/jobs/decidim/admin/newsletter_delivery_job.rb

@@ -10,9 +10,11 @@ module Decidim
       def perform(user, newsletter)
         NewsletterMailer.newsletter(user, newsletter).deliver_now
 
+        # rubocop:disable Rails/SkipsModelValidations
         newsletter.with_lock do
           newsletter.increment!(:total_deliveries)
         end
+        # rubocop:enable Rails/SkipsModelValidations
       end
     end
   end

data/app/models/decidim/admin/abilities/admin_ability.rb

@@ -50,7 +50,8 @@ module Decidim
         private
 
         def empty_available_authorizations?
-          @context[:current_organization] && @context[:current_organization].available_authorizations.empty?
+          return unless @context[:current_organization]
+          @context[:current_organization].available_authorizations.empty?
         end
       end
     end

data/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -2,8 +2,8 @@
 <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
   <ul class="vertical menu add-features">
     <% feature.manifest.export_manifests.each do |manifest| %>
-      <% %w{csv json}.each do |format| %>
-        <li class="exports--format--<%= format %> exports--<%= manifest.name %>"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{feature.manifest.name}.admin.exports.#{manifest.name}"), export_format: format.upcase), exports_path(feature, id: manifest.name, format: format), method: :post %></li>
+      <% %w{CSV JSON Excel}.each do |format| %>
+        <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{feature.manifest.name}.admin.exports.#{manifest.name}"), export_format: format.upcase), exports_path(feature, id: manifest.name, format: format), method: :post %></li>
       <% end %>
     <% end %>
   </ul>

data/app/views/decidim/admin/organization/_form.html.erb

@@ -28,57 +28,12 @@
   </div>
 </div>
 
-<div class="row column">
-  <%= form.translated :editor, :description %>
-</div>
-
-<div class="row column">
-  <%= form.translated :text_area, :welcome_text %>
-</div>
-
 <div class="row column">
   <%= form.collection_select :default_locale, localized_locales(current_organization.available_locales), :id, :name %>
 </div>
 
-<div class="row">
-  <div class="columns xlarge-4">
-    <%= form.upload :homepage_image %>
-  </div>
-
-  <div class="columns xlarge-4">
-    <%= form.upload :logo %>
-  </div>
-
-  <div class="columns xlarge-4">
-    <%= form.upload :favicon %>
-  </div>
-</div>
-
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.upload :official_img_header %>
-  </div>
-
-  <div class="columns xlarge-6">
-    <%= form.upload :official_img_footer %>
-  </div>
-</div>
-
 <div class="row">
   <div class="columns xlarge-6">
     <%= form.text_field :reference_prefix %>
   </div>
-
-  <div class="columns xlarge-6">
-    <%= form.text_field :official_url %>
-  </div>
-</div>
-
-<div class="row column">
-  <%= form.check_box :show_statistics %>
-</div>
-
-<div class="row column">
-  <%= form.text_area :header_snippets %>
-  <p class="help-text"><%= t(".header_snippets_help") %></p>
 </div>