decidim-admin 0.15.2 → 0.16.0

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

@@ -80,7 +80,7 @@ module Decidim
           managed: true,
           name: params.dig(:impersonate_user, :name)
         ) do |u|
-          u.nickname = User.nicknamize(u.name, organization: current_organization)
+          u.nickname = UserBaseEntity.nicknamize(u.name, organization: current_organization)
           u.admin = false
           u.tos_agreement = true
         end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class StaticPageTopicsController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/pages"
+      helper_method :topic
+
+      def new
+        enforce_permission_to :create, :static_page_topic
+        @form = form(StaticPageTopicForm).instance
+      end
+
+      def create
+        enforce_permission_to :create, :static_page_topic
+        @form = form(StaticPageTopicForm).from_params(params["static_page_topic"])
+
+        CreateStaticPageTopic.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("static_page_topics.create.success", scope: "decidim.admin")
+            redirect_to static_pages_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("static_page_topics.create.error", scope: "decidim.admin")
+            render :new
+          end
+        end
+      end
+
+      def edit
+        enforce_permission_to :update, :static_page_topic, static_page_topic: topic
+        @form = form(StaticPageTopicForm).from_model(topic)
+      end
+
+      def update
+        enforce_permission_to :update, :static_page_topic, static_page_topic: topic
+        @form = form(StaticPageTopicForm).from_params(params["static_page_topic"])
+
+        UpdateStaticPageTopic.call(topic, @form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("static_page_topics.update.success", scope: "decidim.admin")
+            redirect_to static_pages_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("static_page_topics.update.error", scope: "decidim.admin")
+            render :edit
+          end
+        end
+      end
+
+      def destroy
+        enforce_permission_to :destroy, :static_page_topic, static_page_topic: topic
+
+        DestroyStaticPage.call(topic, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("static_page_topics.destroy.success", scope: "decidim.admin")
+            redirect_to static_pages_path
+          end
+        end
+      end
+
+      private
+
+      def topic
+        @topic ||= StaticPageTopic.where(
+          organization: current_organization
+        ).find(params[:id])
+      end
+    end
+  end
+end

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

@@ -8,9 +8,12 @@ module Decidim
       layout "decidim/admin/pages"
       before_action :tos_version_formatted, only: [:index, :edit]
 
+      helper_method :topics
+
       def index
         enforce_permission_to :read, :static_page
-        @pages = collection
+        @topics = Decidim::StaticPageTopic.where(organization: current_organization)
+        @orphan_pages = collection.where(topic: nil)
       end
 
       def new

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

@@ -5,6 +5,10 @@ module Decidim
     # Controller that allows managing user groups at the admin panel.
     #
     class UserGroupsController < Decidim::Admin::ApplicationController
+      include UserGroups
+
+      before_action :enforce_user_groups_enabled
+
       layout "decidim/admin/users"
 
       def index

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows batch verifying user groups by uploading a CSV file.
+    class UserGroupsCsvVerificationsController < Decidim::Admin::ApplicationController
+      include UserGroups
+
+      before_action :enforce_user_groups_enabled
+
+      layout "decidim/admin/users"
+
+      def new
+        enforce_permission_to :csv_verify, :user_group
+        @form = form(UserGroupCsvVerificationForm).instance
+      end
+
+      def create
+        enforce_permission_to :csv_verify, :user_group
+        @form = form(UserGroupCsvVerificationForm).from_params(params)
+
+        ProcessUserGroupVerificationCsv.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("user_group.csv_verify.success", scope: "decidim.admin")
+            redirect_to decidim_admin.user_groups_path
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("user_group.csv_verify.invalid", scope: "decidim.admin")
+            render :new
+          end
+        end
+      end
+    end
+  end
+end

data/app/events/decidim/attachment_created_event.rb

@@ -12,6 +12,13 @@ module Decidim
       @resource.url
     end
 
+    def resource_text
+      translated_attribute(
+        resource.try(:description) ||
+          resource.try(:body)
+      )
+    end
+
     private
 
     def attached_to_url

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This form contains the presentational and validation logic to update
+    # ContextualHelpSections from the admin panel.
+    class HelpSectionForm < Decidim::Form
+      include TranslatableAttributes
+      include TranslationsHelper
+
+      attribute :id, String
+      translatable_attribute :content, String
+
+      def name
+        multi_translation("activerecord.models.#{manifest.model_class_name.underscore}.other")
+      end
+
+      private
+
+      def manifest
+        @manifest ||= Decidim.find_participatory_space_manifest(id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This form contains the presentational and validation logic to update
+    # ContextualHelpSections in batch from the admin panel.
+    class HelpSectionsForm < Decidim::Form
+      attribute :sections, Array[HelpSectionForm]
+    end
+  end
+end

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

@@ -19,6 +19,15 @@ module Decidim
       attribute :github_handler, String
       attribute :default_locale, String
       attribute :badges_enabled, Boolean
+      attribute :user_groups_enabled, Boolean
+
+      attribute :send_welcome_notification, Boolean
+      attribute :customize_welcome_notification, Boolean
+
+      translatable_attribute :welcome_notification_subject, String
+      translatable_attribute :welcome_notification_body, String
+
+      validates :welcome_notification_subject, :welcome_notification_body, translatable_presence: true, if: proc { |form| form.customize_welcome_notification }
 
       validates :name, presence: true
       validates :default_locale, :reference_prefix, presence: true

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

@@ -10,6 +10,9 @@ module Decidim
       translatable_attribute :title, String
       translatable_attribute :content, String
       attribute :changed_notably, Boolean
+      attribute :show_in_footer, Boolean
+      attribute :weight, Integer
+      attribute :topic_id, Integer
 
       mimic :static_page
 
@@ -25,6 +28,19 @@ module Decidim
         super.to_s.downcase
       end
 
+      def topic
+        @topic ||= StaticPageTopic.find_by(
+          organization: organization,
+          id: topic_id
+        )
+      end
+
+      def topics
+        @topics ||= StaticPageTopic.where(
+          organization: current_organization
+        )
+      end
+
       private
 
       def slug_uniqueness

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A form object to create or update pages.
+    class StaticPageTopicForm < Form
+      include TranslatableAttributes
+
+      translatable_attribute :title, String
+      translatable_attribute :description, String
+      attribute :show_in_footer, Boolean
+      attribute :weight, Integer
+
+      mimic :static_page_topic
+
+      validates :title, translatable_presence: true
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A form object used to upload CSV to batch verify user groups.
+    #
+    class UserGroupCsvVerificationForm < Form
+      attribute :file
+
+      validates :file, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Custom ApplicationJob scoped to the admin panel.
+    #
+    class VerifyUserGroupFromCsvJob < ApplicationJob
+      queue_as :default
+
+      def perform(email, verifier, organization)
+        @organization = organization
+        @email = email.downcase.strip
+
+        return if email.blank?
+        return unless user_group
+        Decidim::Admin::VerifyUserGroup.call(user_group, verifier, true)
+      end
+
+      private
+
+      def user_group
+        @user_group ||= UserGroup.where(organization: @organization)
+                                 .where.not(confirmed_at: nil)
+                                 .not_verified
+                                 .find_by(email: @email)
+      end
+    end
+  end
+end

data/app/permissions/decidim/admin/permissions.rb

@@ -43,6 +43,8 @@ module Decidim
           allow! if permission_action.subject == :officialization
           allow! if permission_action.subject == :authorization
           allow! if permission_action.subject == :authorization_workflow
+          allow! if permission_action.subject == :static_page_topic
+          allow! if permission_action.subject == :help_sections
         end
 
         permission_action

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

@@ -0,0 +1,21 @@
+<%= decidim_form_for(form, url: help_sections_path, method: :put) do |f| %>
+  <% f.object.sections.each do |section| %>
+    <%= f.fields_for "sections[]", section do |section_form| %>
+      <div class="card" id="area-types">
+        <div class="card-divider">
+          <h2 class="card-title">
+            <%= translated_attribute section.name %>
+          </h2>
+        </div>
+        <div class="card-section">
+          <%= section_form.hidden_field :id %>
+          <%= section_form.translated :editor, :content, tabs_id: "sections_#{section_form.object.id}_content" %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".save") %>
+  </div>
+<% end %>

data/app/views/decidim/admin/help_sections/show.erb

@@ -0,0 +1 @@
+<%= render partial: "form", object: @form %>

data/app/views/decidim/admin/help_sections/update.html.erb

@@ -0,0 +1 @@
+<%= render partial: "form", object: @form %>

data/app/views/decidim/admin/officializations/index.html.erb

@@ -37,7 +37,7 @@
 
 <div class="card" id='user-groups'>
   <div class="card-divider">
-    <h2 class="card-title"><%= t "decidim.admin.titles.officializations" %></h2>
+    <h2 class="card-title"><%= t "decidim.admin.titles.participants" %></h2>
   </div>
   <div class="card-section">
     <div class="table-scroll">

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

@@ -43,3 +43,25 @@
     <%= form.check_box :badges_enabled %>
   </div>
 </div>
+
+<div class="row">
+  <div class="columns xlarge-6">
+    <%= form.check_box :user_groups_enabled %>
+  </div>
+</div>
+
+<div class="row" id="welcome-notification-details">
+  <div class="columns xlarge-6">
+    <%= form.check_box :send_welcome_notification %>
+    <div class="send-welcome-notification-details">
+      <%= form.check_box :customize_welcome_notification %>
+
+      <div class="customize-welcome-notification-details">
+        <%= form.translated :text_field, :welcome_notification_subject %>
+        <%= form.translated :editor, :welcome_notification_body %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= javascript_include_tag "decidim/admin/welcome_notification.js" %>

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

@@ -0,0 +1,15 @@
+<div class="row column">
+  <%= form.translated :text_field, :title, autofocus: true %>
+</div>
+
+<div class="row column">
+  <%= form.translated :text_field, :description %>
+</div>
+
+<div class="row column">
+  <%= form.number_field :weight %>
+</div>
+
+<div class="row column">
+  <%= form.check_box :show_in_footer %>
+</div>

data/app/views/decidim/admin/static_page_topics/edit.html.erb

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, html: { class: "form edit_static_page_topic" }) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: "form", object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

data/app/views/decidim/admin/static_page_topics/new.html.erb

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, html: { class: "form new_static_page_topic" }) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: "form", object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".create") %>
+  </div>
+<% end %>

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

@@ -12,4 +12,16 @@
   <%= form.translated :editor, :content, toolbar: :full, lines: 25 %>
 </div>
 
+<div class="row column">
+  <%= form.select :topic_id, form.object.topics.map { |topic| [translated_attribute(topic.title), topic.id] }, include_blank: t(".none") %>
+</div>
+
 <%= render partial: "form_notable_changes", locals: { form: form } %>
+
+<div class="row column">
+  <%= form.number_field :weight %>
+</div>
+
+<div class="row column">
+  <%= form.check_box :show_in_footer %>
+</div>