decidim 0.3.2 → 0.4.0

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

data/decidim-admin/app/forms/decidim/admin/participatory_process_copy_form.rb

@@ -10,12 +10,11 @@ module Decidim
 
       translatable_attribute :title, String
 
+      mimic :participatory_process
+
       attribute :slug, String
       attribute :copy_steps, Boolean
       attribute :copy_categories, Boolean
-      attribute :copy_process_users, Boolean
-      attribute :copy_moderations, Boolean
-      attribute :copy_pages, Boolean
       attribute :copy_features, Boolean
 
       validates :slug, presence: true

data/decidim-admin/app/forms/decidim/admin/participatory_process_form.rb

@@ -27,7 +27,9 @@ module Decidim
       attribute :promoted, Boolean
       attribute :scope_id, Integer
       attribute :hero_image
+      attribute :remove_hero_image
       attribute :banner_image
+      attribute :remove_banner_image
       attribute :participatory_process_group_id, Integer
 
       validates :slug, presence: true

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

@@ -14,10 +14,16 @@ module Decidim
 
       validates :slug, presence: true
       validates :title, :content, translatable_presence: true
+      validates :slug, format: { with: /\A[a-z0-9-]+/ }
+
       validate :slug, :slug_uniqueness
 
       alias organization current_organization
 
+      def slug
+        super.to_s.downcase
+      end
+
       private
 
       def slug_uniqueness

data/decidim-admin/app/helpers/decidim/admin/menu_helper.rb

@@ -6,7 +6,7 @@ module Decidim
     module MenuHelper
       # Public: Returns the main menu presenter object
       def main_menu
-        @main_menu ||= MenuPresenter.new(
+        @main_menu ||= ::Decidim::MenuPresenter.new(
           :admin_menu,
           self,
           active_class: "is-active"

data/decidim-admin/app/jobs/decidim/admin/newsletter_job.rb

@@ -8,10 +8,12 @@ module Decidim
       queue_as :newsletter
 
       def perform(newsletter)
-        newsletter.with_lock do
-          raise "Newsletter already sent" if newsletter.sent?
+        @newsletter = newsletter
 
-          newsletter.update_attributes!(
+        @newsletter.with_lock do
+          raise "Newsletter already sent" if @newsletter.sent?
+
+          @newsletter.update_attributes!(
             sent_at: Time.current,
             total_recipients: recipients.count,
             total_deliveries: 0
@@ -19,14 +21,16 @@ module Decidim
         end
 
         recipients.find_each do |user|
-          NewsletterDeliveryJob.perform_later(user, newsletter)
+          NewsletterDeliveryJob.perform_later(user, @newsletter)
         end
       end
 
       private
 
       def recipients
-        @recipients ||= User.where(newsletter_notifications: true).where.not(email: nil, confirmed_at: nil)
+        @recipients ||= User.where(newsletter_notifications: true, organization: @newsletter.organization)
+                            .where.not(email: nil, confirmed_at: nil)
+                            .not_deleted
       end
     end
   end

data/decidim-admin/app/views/decidim/admin/attachments/_form.html.erb

@@ -15,18 +15,7 @@
     </div>
 
     <div class="row column">
-      <%= form.file_field :file %>
+      <%= form.upload :file, optional: false %>
     </div>
-
-    <% if @attachment && @attachment.file.present? %>
-      <div class="row column">
-        <label><%= t('.current_file') %></label>
-        <% if @attachment.photo? %>
-          <%= image_tag form.object.file.url(:thumbnail) %>
-        <% end %>
-        <label><%= t('.url') %></label>
-        <%= link_to @attachment.file.url, @attachment.file.url, target: "_blank" %>
-      </div>
-    <% end %>
   </div>
 </div>

data/decidim-admin/app/views/decidim/admin/features/_feature.html.erb

@@ -1,6 +1,6 @@
 <tr class="feature-<%= feature.id %>">
   <td>
-    <%= link_to decidim.feature_path(participatory_process, feature), target: "_blank" do %>
+    <%= link_to feature_path(feature), target: "_blank" do %>
       <%= translated_attribute feature.name %>
     <% end %>
   </td>
@@ -9,7 +9,7 @@
   </td>
   <td class="table-list__actions">
     <% if feature.manifest.admin_engine %>
-      <%= icon_link_to "pencil", manage_feature_path(participatory_process, feature), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
+      <%= icon_link_to "pencil", manage_feature_path(feature), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
     <% end %>
 
     <% if can?(:update, feature) %>

data/decidim-admin/app/views/decidim/admin/features/_form.html.erb

@@ -55,6 +55,24 @@
             </div>
           </div>
         </fieldset>
+      <% elsif form.object.default_step_settings? %>
+        <fieldset class="default-step-settings">
+          <div class="card">
+            <div class="card-divider">
+              <legend><%= t ".default_step_settings" %></legend>
+            </div>
+            <div class="card-section">
+              <%= form.fields_for :default_step_settings, form.object.default_step_settings do |settings_fields| %>
+                <%= render partial: "decidim/admin/features/settings_fields",
+                          locals: {
+                            form: settings_fields,
+                            feature: @feature,
+                            settings_name: "step"
+                          } %>
+              <% end %>
+            </div>
+          </div>
+        </fieldset>
       <% end %>
     </div>
   </div>

data/decidim-admin/app/views/decidim/admin/moderations/_report.html.erb

@@ -1,11 +1,11 @@
 <% if report.details.blank? %>
-  <%= report.reason %>
+  <%= t(".reasons.#{report.reason}") %>
 <% else %>
   <span
     data-tooltip
     aria-haspopup="true"
     class="has-tip"
     title="<%= report.details %>">
-      <%= report.reason %>
+      <%= t(".reasons.#{report.reason}") %>
   </span>
 <% end %>

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

@@ -42,55 +42,25 @@
 
 <div class="row">
   <div class="columns xlarge-4">
-    <%= form.file_field :homepage_image %>
-    <% if current_organization.homepage_image.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.homepage_image.big.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.homepage_image.file.filename, current_organization.homepage_image.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :homepage_image %>
   </div>
 
   <div class="columns xlarge-4">
-    <%= form.file_field :logo %>
-    <% if current_organization.logo.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.logo.medium.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.logo.file.filename, current_organization.logo.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :logo %>
   </div>
 
   <div class="columns xlarge-4">
-    <%= form.file_field :favicon %>
-    <% if current_organization.favicon.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.favicon.big.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.favicon.file.filename, current_organization.favicon.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :favicon %>
   </div>
 </div>
 
 <div class="row">
   <div class="columns xlarge-6">
-    <%= form.file_field :official_img_header %>
-    <% if current_organization.official_img_header.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.official_img_header.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.official_img_header.file.filename, current_organization.official_img_header.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :official_img_header %>
   </div>
 
   <div class="columns xlarge-6">
-    <%= form.file_field :official_img_footer %>
-    <% if current_organization.official_img_footer.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.official_img_footer.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.official_img_footer.file.filename, current_organization.official_img_footer.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :official_img_footer %>
   </div>
 </div>