decidim 0.5.1 → 0.6.0

data/decidim-admin/app/controllers/decidim/admin/features_controller.rb

@@ -6,14 +6,12 @@ module Decidim
     # admin panel.
     #
     class FeaturesController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
-
-      helper_method :manifest
+      helper_method :manifest, :current_participatory_space
 
       def index
         authorize! :read, Feature
         @manifests = Decidim.feature_manifests
-        @features = current_participatory_process.features
+        @features = current_participatory_space.features
       end
 
       def new
@@ -22,7 +20,7 @@ module Decidim
         @feature = Feature.new(
           name: default_name(manifest),
           manifest_name: params[:type],
-          participatory_process: current_participatory_process
+          participatory_space: current_participatory_space
         )
 
         @form = form(FeatureForm).from_model(@feature)
@@ -32,7 +30,7 @@ module Decidim
         @form = form(FeatureForm).from_params(params)
         authorize! :create, Feature
 
-        CreateFeature.call(manifest, @form, current_participatory_process) do
+        CreateFeature.call(manifest, @form, current_participatory_space) do
           on(:ok) do
             flash[:notice] = I18n.t("features.create.success", scope: "decidim.admin")
             redirect_to action: :index
@@ -110,7 +108,7 @@ module Decidim
       private
 
       def query_scope
-        current_participatory_process.features
+        current_participatory_space.features
       end
 
       def manifest

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

@@ -4,8 +4,6 @@ module Decidim
   module Admin
     # This controller allows admins to manage moderations in a participatory process.
     class ModerationsController < Decidim::Admin::ApplicationController
-      include Concerns::ParticipatoryProcessAdmin
-
       helper_method :moderations
 
       def index
@@ -49,19 +47,19 @@ module Decidim
       def moderations
         @moderations ||= begin
           if params[:hidden]
-            participatory_process_moderations.where.not(hidden_at: nil)
+            participatory_space_moderations.where.not(hidden_at: nil)
           else
-            participatory_process_moderations.where(hidden_at: nil)
+            participatory_space_moderations.where(hidden_at: nil)
           end
         end
       end
 
       def reportable
-        @reportable ||= participatory_process_moderations.find(params[:id]).reportable
+        @reportable ||= participatory_space_moderations.find(params[:id]).reportable
       end
 
-      def participatory_process_moderations
-        @participatory_process_moderations ||= Decidim::Moderation.where(participatory_process: current_participatory_process)
+      def participatory_space_moderations
+        @participatory_space_moderations ||= Decidim::Moderation.where(participatory_space: current_participatory_space)
       end
     end
   end

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

@@ -10,11 +10,7 @@ module Decidim
 
       def index
         authorize! :index, Scope
-        @scopes = if parent_scope
-                    parent_scope.children
-                  else
-                    collection.top_level
-                  end
+        @scopes = children_scopes.order("name->'#{I18n.locale}' ASC")
       end
 
       def new
@@ -71,16 +67,22 @@ module Decidim
 
       private
 
-      def scope
-        @scope ||= collection.find(params[:id])
+      def organization_scopes
+        current_organization.scopes
       end
 
       def parent_scope
-        @parent_scope ||= @scope ? @scope.parent : collection.find_by_id(params[:scope_id])
+        return @parent_scope if defined?(@parent_scope)
+        @parent_scope = scope ? scope.parent : organization_scopes.find_by_id(params[:scope_id])
       end
 
-      def collection
-        current_organization.scopes
+      def scope
+        return @scope if defined?(@scope)
+        @scope = organization_scopes.find_by_id(params[:id])
+      end
+
+      def children_scopes
+        @subscopes ||= parent_scope ? parent_scope.children : organization_scopes.top_level
       end
 
       def current_scopes_path

data/decidim-admin/app/controllers/decidim/admin/users_controller.rb

@@ -21,9 +21,7 @@ module Decidim
         default_params = {
           organization: current_organization,
           invitation_instructions: "invite_admin",
-          invited_by: current_user,
-          comments_notifications: true,
-          replies_notifications: true
+          invited_by: current_user
         }
 
         @form = form(InviteUserForm).from_params(params.merge(default_params))

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

@@ -16,10 +16,10 @@ module Decidim
       validates :name, :description, translatable_presence: true
       validates :parent_id, inclusion: { in: :parent_categories_ids }, allow_blank: true
 
-      delegate :current_process, to: :context, prefix: false
+      delegate :current_participatory_space, to: :context, prefix: false
 
       def parent_categories
-        @parent_categories ||= current_process.categories.first_class.where.not(id: id)
+        @parent_categories ||= current_participatory_space.categories.first_class.where.not(id: id)
       end
 
       private

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

@@ -19,13 +19,7 @@ module Decidim
       attribute :weight, Integer, default: 0
 
       attribute :step_settings, Hash[String => Object]
-      attribute :participatory_process
-
-      def map_model(model)
-        self.attributes = model.attributes
-        self.settings = model.settings
-        self.default_step_settings = model.default_step_settings
-      end
+      attribute :participatory_space
 
       def settings?
         settings.manifest.attributes.any?
@@ -34,17 +28,6 @@ module Decidim
       def default_step_settings?
         default_step_settings.manifest.attributes.any?
       end
-
-      def step_settings?
-        return false unless participatory_process.steps.any?
-
-        step_settings
-          .values
-          .map(&:manifest)
-          .flat_map(&:attributes)
-          .flat_map(&:keys)
-          .any?
-      end
     end
   end
 end

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

@@ -30,6 +30,7 @@ module Decidim
       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

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

@@ -13,6 +13,16 @@ module Decidim
       def export_dropdown(feature = current_feature)
         render partial: "decidim/admin/exports/dropdown", locals: { feature: feature }
       end
+
+      # Routes to the correct exporter for a feature.
+      #
+      # feature - The feature to be routed.
+      # options - Extra options that need to be passed to the route.
+      #
+      # Returns the path to the feature exporter.
+      def exports_path(feature, options)
+        EngineRouter.admin_proxy(feature.participatory_space).feature_exports_path(options.merge(feature_id: feature))
+      end
     end
   end
 end

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

@@ -9,9 +9,6 @@ module Decidim
         def define_abilities
           super
 
-          can :manage, ParticipatoryProcess
-          can :manage, ParticipatoryProcessGroup
-          can :manage, ParticipatoryProcessStep
           can :manage, Category
           can :manage, ParticipatoryProcessUserRole
           can [:create, :update, :index, :new, :read], StaticPage

data/decidim-admin/app/models/decidim/admin/abilities/participatory_process_admin_ability.rb

@@ -25,11 +25,11 @@ module Decidim
           super
 
           can :manage, Feature do |feature|
-            can_manage_process?(feature.participatory_process)
+            can_manage_process?(feature.participatory_space)
           end
 
           can :manage, Category do |category|
-            can_manage_process?(category.participatory_process)
+            can_manage_process?(category.participatory_space)
           end
 
           can :manage, Attachment do |attachment|
@@ -41,7 +41,7 @@ module Decidim
           end
 
           can :manage, Moderation do |moderation|
-            can_manage_process?(moderation.participatory_process)
+            can_manage_process?(moderation.participatory_space)
           end
 
           can :manage, ParticipatoryProcessStep do |step|

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: url_for([@attachment.attached_to, @attachment]), html: { class: "form edit_participatory_process_attachment" }) do |f| %>
+<%= decidim_form_for(@form, url: url_for([@attachment.attached_to, @attachment]), html: { class: "form edit_attachment" }) do |f| %>
   <%= render partial: 'decidim/admin/attachments/form', object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: url_for([attached_to, @form]), html: { class: "form new_participatory_process_attachment" }) do |f| %>
+<%= decidim_form_for(@form, url: url_for([attached_to, @form]), html: { class: "form new_attachment" }) do |f| %>
   <%= render partial: 'decidim/admin/attachments/form', object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">

data/decidim-admin/app/views/decidim/admin/categories/edit.html.erb

@@ -1,7 +1,7 @@
-<%= decidim_form_for(@form, url: category_path(@category.participatory_process, @category), html: { class: "form edit_participatory_process_category" }) do |f| %>
+<%= decidim_form_for(@form, url: category_path(@category.participatory_space, @category), html: { class: "form edit_category" }) do |f| %>
   <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
 
   <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
+    <%= f.submit t("categories.edit.update", scope: "decidim.admin") %>
   </div>
 <% end %>

data/decidim-admin/app/views/decidim/admin/categories/index.html.erb

@@ -1,15 +1,15 @@
 <div class="card" id="categories">
   <div class="card-divider">
     <h2 class='card-title'>
-      <%= t(".categories_title") %>
+      <%= t("categories.index.categories_title", scope: "decidim.admin") %>
       <% if can? :create, Decidim::Category %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_category_path(current_participatory_process), class: 'button tiny button--title new' %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_category_path(current_participatory_space), class: 'button tiny button--title new' %>
       <% end %>
     </h2>
   </div>
 
   <div class="card-section">
-     <% if current_participatory_process.categories.any? %>
+     <% if current_participatory_space.categories.any? %>
       <div class="table-scroll">
         <table class="table-list">
           <thead>
@@ -19,21 +19,21 @@
             </tr>
           </thead>
           <tbody>
-            <% current_participatory_process.categories.first_class.each do |category| %>
+            <% current_participatory_space.categories.first_class.each do |category| %>
               <tr>
                 <td>
-                  <%= link_to translated_attribute(category.name), edit_category_path(current_participatory_process, category) %><br />
+                  <%= link_to translated_attribute(category.name), edit_category_path(current_participatory_space, category) %><br />
                 </td>
                 <td class="table-list__actions">
                   <% if can? :update, category %>
-                    <%= icon_link_to "pencil", edit_category_path(current_participatory_process, category), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                    <%= icon_link_to "pencil", edit_category_path(current_participatory_space, category), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                   <% end %>
 
                   <% if can? :destroy, category %>
                     <% if category.unused? %>
-                      <%= icon_link_to "circle-x", category_path(current_participatory_process, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                      <%= icon_link_to "circle-x", category_path(current_participatory_space, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                     <% else %>
-                      <span class="action-icon" title="<%= t('.category_used') %>" data-tooltip="true" data-disable-hover="false">
+                      <span class="action-icon" title="<%= t('categories.index.category_used', scope: "decidim.admin") %>" data-tooltip="true" data-disable-hover="false">
                         <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
                       </span>
                     <% end %>
@@ -43,15 +43,15 @@
               <% category.subcategories.each do |subcategory| %>
                 <tr class="extra__table-list__subcategory">
                   <td>
-                    <%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_process, subcategory) %><br />
+                    <%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %><br />
                   </td>
                   <td class="table-list__actions">
                   <% if can? :update, subcategory %>
-                    <%= icon_link_to "pencil", edit_category_path(current_participatory_process, subcategory), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                    <%= icon_link_to "pencil", edit_category_path(current_participatory_space, subcategory), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                   <% end %>
 
                   <% if can? :destroy, subcategory %>
-                    <%= icon_link_to "circle-x", category_path(current_participatory_process, subcategory), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                    <%= icon_link_to "circle-x", category_path(current_participatory_space, subcategory), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                   <% end %>
                   </td>
                 </tr>

data/decidim-admin/app/views/decidim/admin/categories/new.html.erb

@@ -1,7 +1,7 @@
-<%= decidim_form_for(@form, url: categories_path(current_participatory_process), html: { class: "form new_participatory_process_category" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
+<%= decidim_form_for(@form, url: categories_path(current_participatory_space), html: { class: "form new_category" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('categories.new.title', scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
+    <%= f.submit t("categories.new.create", scope: "decidim.admin") %>
   </div>
 <% end %>

data/decidim-admin/app/views/decidim/admin/categories/show.html.erb

@@ -2,8 +2,8 @@
 
 <div class="actions">
   <hr />
-  <%= link_to t("decidim.admin.actions.edit"), ['edit', participatory_process, @category] if can? :update, @category %>
-  <%= link_to t("decidim.admin.actions.destroy"), [participatory_process, @category], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if can? :destroy, @category %>
+  <%= link_to t("decidim.admin.actions.edit"), ['edit', participatory_space, @category] if can? :update, @category %>
+  <%= link_to t("decidim.admin.actions.destroy"), [participatory_space, @category], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if can? :destroy, @category %>
 </div>
 
 <dl>

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

@@ -3,7 +3,7 @@
   <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), decidim_admin.feature_exports_path(feature_id: feature, participatory_process_id: feature.participatory_process, format: format, id: manifest.name), method: :post %></li>
+        <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>
       <% end %>
     <% end %>
   </ul>

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

@@ -29,27 +29,27 @@
         </fieldset>
       <% end %>
 
-      <% if form.object.step_settings? %>
+      <% if current_participatory_space.has_steps? %>
         <fieldset class="step-settings">
           <div class="card">
             <div class="card-divider">
               <legend><%= t ".step_settings" %></legend>
             </div>
             <div class="card-section">
-              <% current_participatory_process.steps.each do |step| %>
+              <% current_participatory_space.steps.each do |step| %>
                 <fieldset class="step-settings-<%= step.id %>">
                   <legend><%= step.position + 1 %>. <%= translated_attribute step.title %></legend>
                   <% step_settings = form.object.step_settings[step.id.to_s] %>
 
-                  <%= form.fields_for "step_settings", nil do |settings_fields| %>
+                  <%= form.fields_for :step_settings, nil do |settings_fields| %>
                     <%= settings_fields.fields_for step.id.to_s, step_settings do |settings_fields| %>
                       <%= render partial: "decidim/admin/features/settings_fields",
-                      locals: {
-                        form: settings_fields,
-                        feature: feature,
-                        settings_name: "step",
-                        tabs_prefix: "step-#{step.id}-settings"
-                      } %>
+                                 locals: {
+                                   form: settings_fields,
+                                   feature: feature,
+                                   settings_name: "step",
+                                   tabs_prefix: "step-#{step.id}-settings"
+                                 } %>
                     <% end %>
                   <% end %>
                 </fieldset>
@@ -66,12 +66,12 @@
             <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",
-                            tabs_prefix: "default-step-settings"
-                          } %>
+                           locals: {
+                             form: settings_fields,
+                             feature: @feature,
+                             settings_name: "step",
+                             tabs_prefix: "default-step-settings"
+                           } %>
               <% end %>
             </div>
           </div>

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for([current_participatory_process, @form], url: feature_path(current_participatory_process, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_space, @form], url: feature_path(current_participatory_space, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{@feature.manifest.name}.name", scope: "decidim.features"))} %>
 
   <div class="button--double form-general-submit">

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

@@ -1,5 +1,5 @@
 
-<%= decidim_form_for([current_participatory_process, @form], url: features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_space, @form], url: features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{manifest.name}.name", scope: "decidim.features"))} %>
 
   <div class="button--double form-general-submit">

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

@@ -55,14 +55,14 @@
 
                 <% if can? :unreport, moderation %>
                   <%= icon_link_to "action-undo",
-                                   decidim_admin.unreport_moderation_path(id: moderation),
+                                   unreport_moderation_path(id: moderation),
                                    t("actions.unreport", scope: "decidim.moderations"),
                                    class: "action-icon--unreport",
                                    method: :put %>
                 <% end %>
                 <% if !moderation.reportable.hidden? && can?(:hide, moderation) %>
                   <%= icon_link_to "eye",
-                                   decidim_admin.hide_moderation_path(id: moderation),
+                                   hide_moderation_path(id: moderation),
                                    t("actions.hide", scope: "decidim.moderations"),
                                    class: "action-icon--hide",
                                    method: :put %>