decidim-admin 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2545910a88cea0b28b704cb1477f237be726d98
-  data.tar.gz: a2028b69735ac289d74a1ad19d4ff048138b4965
+  metadata.gz: 9c0d4b42e8b84fba4a3a14ccad8d9c70eed4f10d
+  data.tar.gz: af8756ad81565a4344864c15991586ec9dfcaf07
 SHA512:
-  metadata.gz: 352c16ff07566b2d5fb01852db9e0dbfa326b755e3c46f32eaecae965ec6e11a8b97326b1ae3a31139e6ab049cb150750768c728c27a8732bb42c11c5c5a2a3c
-  data.tar.gz: 19e573d508116d36c0bd164490b1170029920c5cfb52006e6d4002140a07a28e264ae463d0e04e383a29e0890c841b27379909d376672c7ee2f09155d0ac046c
+  metadata.gz: b8fa320e0f63c0fcbf30e1f93e6f10955e53aa38c33f18f37b9acbee05f67e583ee91f9d9b2542d90f59178175e5f7eb80930c2c26c7e763091f9fdc9162cbe1
+  data.tar.gz: b76ae9721bf791470141d73c29c720c37791843156c8d9bc26cf536d5c48486e3be3208b3a64e8a956780b7f2e3c4d7cd9898e079dd9c1397dd86908b6e976da

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

@@ -20,17 +20,13 @@ module Decidim
       def call
         return broadcast(:invalid) if process.nil? || process.published?
 
-        publish_process
+        process.publish!
         broadcast(:ok)
       end
 
       private
 
       attr_reader :process
-
-      def publish_process
-        process.update_attribute(:published_at, Time.current)
-      end
     end
   end
 end

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

@@ -20,17 +20,13 @@ module Decidim
       def call
         return broadcast(:invalid) if process.nil? || !process.published?
 
-        unpublish_process
+        process.unpublish!
         broadcast(:ok)
       end
 
       private
 
       attr_reader :process
-
-      def unpublish_process
-        process.update_attribute(:published_at, nil)
-      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Decidim
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
-      helper Decidim::Admin::FeatureSettingsHelper
+      helper Decidim::Admin::SettingsHelper
       helper Decidim::Admin::ProcessGroupsForSelectHelper
       helper Decidim::Admin::ProcessesForSelectHelper
       helper Decidim::Admin::IconLinkHelper

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

@@ -5,6 +5,7 @@ module Decidim
     # This controller allows admins to manage proposals in a participatory process.
     class ExportsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
+      include Decidim::FeaturePathHelper
 
       def create
         authorize! :manage, feature
@@ -14,19 +15,11 @@ module Decidim
 
         flash[:notice] = t("decidim.admin.exports.notice")
 
-        redirect_back(fallback_location: fallback_location)
+        redirect_back(fallback_location: manage_feature_path(feature))
       end
 
       private
 
-      def fallback_location
-        send(
-          "decidim_admin_#{feature.manifest.name}_path",
-          feature_id: feature.id,
-          participatory_process_id: current_participatory_process.id
-        )
-      end
-
       def default_format
         "json"
       end

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

@@ -22,7 +22,7 @@ module Decidim
         UpdateFeaturePermissions.call(@permissions_form, feature) do
           on(:ok) do
             flash[:notice] = t("feature_permissions.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_features_path(current_participatory_process)
+            redirect_to features_path(current_participatory_process)
           end
 
           on(:invalid) do

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

@@ -8,8 +8,9 @@ module Decidim
       class BaseController < Admin::ApplicationController
         skip_authorize_resource
         include Concerns::ParticipatoryProcessAdmin
-        include FeatureSettings
+        include Settings
 
+        helper Decidim::ResourceHelper
         helper Decidim::Admin::ExportsHelper
 
         helper_method :current_feature,
@@ -30,7 +31,7 @@ module Decidim
         end
 
         def parent_path
-          decidim_admin.participatory_process_features_path(current_participatory_process)
+          decidim_admin.features_path(current_participatory_process)
         end
       end
     end

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

@@ -91,7 +91,7 @@ module Decidim
         @feature = query_scope.find(params[:id])
         authorize! :update, @feature
 
-        @feature.update_attribute(:published_at, Time.current)
+        @feature.publish!
 
         flash[:notice] = I18n.t("features.publish.success", scope: "decidim.admin")
         redirect_to action: :index
@@ -101,7 +101,7 @@ module Decidim
         @feature = query_scope.find(params[:id])
         authorize! :update, @feature
 
-        @feature.update_attribute(:published_at, nil)
+        @feature.unpublish!
 
         flash[:notice] = I18n.t("features.unpublish.success", scope: "decidim.admin")
         redirect_to action: :index

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

@@ -78,7 +78,8 @@ module Decidim
       end
 
       def collection
-        @collection ||= current_user.organization.participatory_process_groups
+        @collection ||=
+          Decidim::OrganizationParticipatoryProcessGroups.new(current_user.organization).query
       end
     end
   end

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

@@ -75,16 +75,20 @@ module Decidim
         authorize! :create, Decidim::ParticipatoryProcess
       end
 
+      private
+
       def current_participatory_process
         @current_participatory_process ||= collection.find(params[:id]) if params[:id]
       end
 
-      private
-
       def collection
         @collection ||= Decidim::ParticipatoryProcessesWithUserRole.for(current_user)
       end
 
+      def ability_context
+        super.merge(current_participatory_process: current_participatory_process)
+      end
+
       def participatory_process_params
         {
           id: params[:id],

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

@@ -24,7 +24,7 @@ module Decidim
       private
 
       def slug_uniqueness
-        return unless current_organization.participatory_processes.where(slug: slug).where.not(id: id).any?
+        return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: id).any?
 
         errors.add(:slug, :taken)
       end

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

@@ -58,7 +58,7 @@ module Decidim
       private
 
       def slug_uniqueness
-        return unless current_organization.participatory_processes.where(slug: slug).where.not(id: id).any?
+        return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: id).any?
 
         errors.add(:slug, :taken)
       end

data/app/helpers/decidim/admin/process_groups_for_select_helper.rb

@@ -12,7 +12,7 @@ module Decidim
       # Returns an Array.
       def process_groups_for_select
         @process_groups_for_select ||=
-          current_organization.participatory_process_groups.map do |group|
+          OrganizationParticipatoryProcessGroups.new(current_organization).map do |group|
             [translated_attribute(group.name), group.id]
           end
       end

data/app/helpers/decidim/admin/processes_for_select_helper.rb

@@ -11,7 +11,7 @@ module Decidim
       #
       # Returns an Array.
       def processes_for_select
-        @processes_for_select ||= current_organization.participatory_processes.map do |process|
+        @processes_for_select ||= OrganizationParticipatoryProcesses.new(current_organization).map do |process|
           [
             translated_attribute(process.title),
             process.id

data/app/helpers/decidim/admin/{feature_settings_helper.rb → settings_helper.rb}

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # This class contains helpers needed in order for feature settings to
     # properly render.
-    module FeatureSettingsHelper
+    module SettingsHelper
       TYPES = {
         boolean: :check_box,
         integer: :number_field,
@@ -16,7 +16,7 @@ module Decidim
       # type.
       #
       # form      - The form in which to render the field.
-      # attribute - The FeatureSettings::Attribute instance with the
+      # attribute - The Settings::Attribute instance with the
       #             description of the attribute.
       # name      - The name of the field.
       # options   - Extra options to be passed to the field helper.

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

@@ -5,8 +5,8 @@ module Decidim
     module Abilities
       # Defines the abilities for a participatory process admin in the admin
       # section. Intended to be used with `cancancan`. This is not intended to
-      # extend the base `Decidim::Ability` class, it should only be used in the
-      # Admin engine.
+      # extend the base `Decidim::Abilities::BaseAbility` class, it should only
+      # be used in the Admin engine.
       #
       # This ability will not apply to organization admins.
       class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility

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

@@ -1,7 +1,7 @@
 <div class='card' id="attachments">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".attachments_title", scope: "decidim.admin") %>
+      <%= t(".attachments_title") %>
       <% if can? :create, authorization_object %>
         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.attachment.name", scope: "decidim.admin")), url_for(action: :new), class: 'button tiny button--title new' %>
       <% end %>

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

@@ -1,7 +1,7 @@
 <div class="card" id="categories">
   <div class="card-divider">
     <h2 class='card-title'>
-      <%= t(".categories_title", scope: "decidim.admin") %>
+      <%= t(".categories_title") %>
       <% if can? :create, Decidim::Category %>
         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_participatory_process_category_path(current_participatory_process), class: 'button tiny button--title new' %>
       <% end %>

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

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

@@ -1,6 +1,6 @@
 <tr class="feature-<%= feature.id %>">
   <td>
-    <%= link_to feature_path(feature), target: "_blank" do %>
+    <%= link_to main_feature_path(feature), target: "_blank" do %>
       <%= translated_attribute feature.name %>
     <% end %>
   </td>
@@ -28,7 +28,7 @@
       <% if feature.manifest.actions.empty? %>
         <%= icon "key", class: "action-icon action-icon--disabled" %>
       <% else %>
-        <%= icon_link_to "key", edit_participatory_process_feature_permissions_path(feature_id: feature), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+        <%= icon_link_to "key", url_for(action: :edit, feature_id: feature, controller: "feature_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
       <% end %>
     <% end %>
 

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for([current_participatory_process, @form], url: participatory_process_feature_path(current_participatory_process, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_process, @form], url: feature_path(current_participatory_process, @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/app/views/decidim/admin/features/index.html.erb

@@ -6,7 +6,7 @@
       <div class="dropdown-pane" id="add-feature-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
         <ul class="vertical menu add-features">
           <% @manifests.each do |manifest| %>
-            <li><%= link_to t("#{manifest.name}.name", scope: "decidim.features"), new_participatory_process_feature_path(type: manifest.name), class: manifest.name %></li>
+            <li><%= link_to t("#{manifest.name}.name", scope: "decidim.features"), new_feature_path(type: manifest.name), class: manifest.name %></li>
           <% end %>
         </ul>
       </div>

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

@@ -1,5 +1,5 @@
 
-<%= decidim_form_for([current_participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_process, @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/app/views/decidim/admin/participatory_process_groups/show.html.erb

@@ -3,7 +3,7 @@
     :name,
     :description
   %>
- 
+
   <dt><%= display_label(participatory_process_group, :participatory_processes) %></dt>
   <% if participatory_process_group.participatory_processes.any? %>
     <dd>

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

@@ -1,7 +1,7 @@
 <div class="card" id="steps">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".steps_title", scope: "decidim.admin") %>
+      <%= t(".steps_title") %>
       <% if can? :create, Decidim::ParticipatoryProcessStep %>
         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_step.name", scope: "decidim.admin")), new_participatory_process_step_path(current_participatory_process), class: 'button tiny button--title' %>
       <% end %>
@@ -60,4 +60,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</div>

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

@@ -5,4 +5,3 @@
     <%= f.submit t(".create") %>
   </div>
 <% end %>
- 

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

@@ -1,7 +1,7 @@
 <div class='card' id="process_admins">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".process_admins_title", scope: "decidim.admin") %>
+      <%= t(".process_admins_title") %>
       <% if can? :create, Decidim::ParticipatoryProcessUserRole %>
          <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_user_role.name", scope: "decidim.admin")), new_participatory_process_user_role_path(current_participatory_process), class: 'button tiny button--title new' %>
       <% end %>

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

@@ -1,7 +1,7 @@
-  <%= decidim_form_for(@form, html: { class: "form new_participatory_process_user_role" }) do |f| %>
-    <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
+<%= decidim_form_for(@form, html: { class: "form new_participatory_process_user_role" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
 
-    <div class="button--double form-general-submit">
-      <%= f.submit t(".create") %>
-    </div>
-  <% end %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".create") %>
+  </div>
+<% end %>

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

@@ -9,4 +9,3 @@
     <%= f.submit t(".create") %>
   </div>
 <% end %>
- 

data/app/views/layouts/decidim/admin/participatory_process.html.erb

@@ -12,8 +12,8 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Feature %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_features_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_features_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin.features_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.features_path(current_participatory_process) %>
           <ul>
             <% current_participatory_process.features.each do |feature| %>
               <% if feature.manifest.admin_engine %>

data/config/locales/ca.yml

@@ -139,6 +139,8 @@ ca:
         edit:
           title: Edita arxiu adjunt
           update: Actualitzar
+        index:
+          attachments_title: Adjunts
         new:
           create: Crea arxiu adjunt
           title: Nou arxiu adjunt
@@ -156,6 +158,7 @@ ca:
           title: Edita categoria
           update: Actualitzar
         index:
+          categories_title: Categories
           category_used: Aquesta categoria no es pot suprimir perquè és en ús.
         new:
           create: Crea una categoria
@@ -166,20 +169,6 @@ ca:
       dashboard:
         show:
           welcome: Benvingut al nou panell d'administració de Decidim.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Adjunts
-          categories:
-            index:
-              categories_title: Categories
-          participatory_process_steps:
-            index:
-              steps_title: Fases
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Usuaris del procés participatiu
       exports:
         export_as: "%{name} com a %{export_format}"
         notice: La teva exportació està actualment en curs. Rebràs un correu electrònic quan hagi finalitzat.
@@ -402,6 +391,8 @@ ca:
         edit:
           title: Editar fase de procés participatiu
           update: Actualitzar
+        index:
+          steps_title: Fases del procés
         new:
           create: Crear
           title: Nova fase de procés participatiu
@@ -419,6 +410,8 @@ ca:
         edit:
           title: Editar usuari de procés participatiu.
           update: Actualitzar
+        index:
+          process_admins_title: Usuaris del procés participatiu
         new:
           create: Crear
           title: Nou usuari de procés participatiu.

data/config/locales/en.yml

@@ -140,6 +140,8 @@ en:
         edit:
           title: Edit attachment
           update: Update
+        index:
+          attachments_title: Attachments
         new:
           create: Create attachment
           title: New attachment
@@ -157,6 +159,7 @@ en:
           title: Edit category
           update: Update
         index:
+          categories_title: Categories
           category_used: This category cannot be removed because it is in use.
         new:
           create: Create category
@@ -167,20 +170,6 @@ en:
       dashboard:
         show:
           welcome: Welcome to the new Decidim Panel Admin.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Attachments
-          categories:
-            index:
-              categories_title: Categories
-          participatory_process_steps:
-            index:
-              steps_title: Steps
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Participatory process users
       exports:
         export_as: "%{name} as %{export_format}"
         notice: Your export is currently in progress. You'll receive an email when it's complete.
@@ -403,6 +392,8 @@ en:
         edit:
           title: Edit participatory process step
           update: Update
+        index:
+          steps_title: Steps
         new:
           create: Create
           title: New participatory process step
@@ -420,6 +411,8 @@ en:
         edit:
           title: Update participatory process user.
           update: Update
+        index:
+          process_admins_title: Participatory process users
         new:
           create: Create
           title: New participatory process user.

data/config/locales/es.yml

@@ -139,6 +139,8 @@ es:
         edit:
           title: Editar archivo adjunto
           update: Actualizar
+        index:
+          attachments_title: Archivos adjuntos
         new:
           create: Crear archivo adjunto
           title: Nuevo archivo adjunto
@@ -156,6 +158,7 @@ es:
           title: Editar categoría
           update: Actualizar
         index:
+          categories_title: Categorías
           category_used: Esta categoría no se puede eliminar porque está en uso.
         new:
           create: Crear categoría
@@ -166,20 +169,6 @@ es:
       dashboard:
         show:
           welcome: Bienvenido al nuevo panel de administración de Decidim.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Archivos adjuntos
-          categories:
-            index:
-              categories_title: Categorías
-          participatory_process_steps:
-            index:
-              steps_title: Fases
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Usuarios del proceso
       exports:
         export_as: "%{name} como %{export_format}"
         notice: Su exportación está actualmente en curso. Recibirá un correo electrónico cuando esté completo.
@@ -402,6 +391,8 @@ es:
         edit:
           title: Editar fase de proceso participativo
           update: Actualizar
+        index:
+          steps_title: Fases del proceso
         new:
           create: Crear
           title: Nuevo fase de proceso participativo
@@ -419,6 +410,8 @@ es:
         edit:
           title: Editar usuario del proceso
           update: Actualizar
+        index:
+          process_admins_title: Usuarios del proceso
         new:
           create: Crear
           title: Nuevo usuario del proceso

data/config/locales/eu.yml

@@ -135,6 +135,8 @@ eu:
         edit:
           title: Editatu fitxategi erantsia
           update: Eguneratu
+        index:
+          attachments_title: Fitxategi erantsiak
         new:
           create: Sortu fitxategi erantsia
           title: Fitxategi erantsi berria
@@ -151,6 +153,8 @@ eu:
         edit:
           title: Editatu kategoria
           update: Eguneratu
+        index:
+          categories_title: Kategoriak
         new:
           create: Sortu kategoria
           title: Kategoria berria
@@ -160,20 +164,6 @@ eu:
       dashboard:
         show:
           welcome: Ongi etorri Decidim administrazio-panel berrira.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Fitxategi erantsiak
-          categories:
-            index:
-              categories_title: Kategoriak
-          participatory_process_steps:
-            index:
-              steps_title: Faseak
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Prozesu partizipatiboko erabiltzaileak
       exports:
         export_as: "%{name} honako hau gisa: %{export_format}"
         notice: Zure esportazioa bidean da. Mezu elektroniko bat jasoko duzu bukatutakoan.
@@ -387,6 +377,8 @@ eu:
         edit:
           title: Editatu prozesu partizipatiboaren fasea
           update: Eguneratu
+        index:
+          steps_title: Faseak
         new:
           create: Sortu
           title: Prozesu partizipatiboaren fase berria
@@ -404,6 +396,8 @@ eu:
         edit:
           title: Prozesu partizipatiboko erabiltzailea eguneratzea.
           update: Eguneratu
+        index:
+          process_admins_title: Prozesu partizipatiboko erabiltzaileak
         new:
           create: Sortu
           title: Partaidetza-prozesu berriko erabiltzailea.
@@ -530,4 +524,4 @@ eu:
   time:
     formats:
       datepicker: "%Y / %m / %d"
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"

data/config/locales/fi.yml

@@ -111,6 +111,8 @@ fi:
           success: Liite tuhottu onnistuneesti.
         edit:
           title: Muokkaa liitettä
+        index:
+          attachments_title: Liitteet
         new:
           create: Luo liite
           title: Uusi liite
@@ -126,23 +128,14 @@ fi:
           success: Kategoria poistettu onnistuneesti.
         edit:
           title: Muokkaa kategoriaa
+        index:
+          categories_title: Kategoriat
         new:
           create: Luo kategoria
           title: Uusi kategoria
         update:
           error: Tämän kategorian luonnissa tapahtui virhe.
           success: Kategoria päivitetty onnistuneesti.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Liitteet
-          categories:
-            index:
-              categories_title: Kategoriat
-          participatory_process_steps:
-            index:
-              steps_title: Vaihe
       feature_permissions:
         edit:
           everyone: Kaikki
@@ -320,6 +313,8 @@ fi:
           success: Osallistumisprosessin vaihe tuhottu onnistuneesti.
         edit:
           title: Muokkaa osallistumisprosessin vaihetta
+        index:
+          steps_title: Vaihe
         new:
           title: Uusi osallistumisprosessin vaihe
         ordering:
@@ -415,4 +410,4 @@ fi:
         none: Ei ryhmää
   time:
     formats:
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"

data/config/locales/fr.yml

@@ -133,6 +133,8 @@ fr:
         edit:
           title: Modifier le document lié
           update: Mettre à jour
+        index:
+          attachments_title: Pièces jointes
         new:
           create: Lier un document
           title: Nouveau document lié
@@ -149,6 +151,8 @@ fr:
         edit:
           title: Modifier la catégorie
           update: Mettre à jour
+        index:
+          categories_title: Catégories
         new:
           create: Créer une catégorie
           title: Nouvelle catégorie
@@ -158,20 +162,6 @@ fr:
       dashboard:
         show:
           welcome: Bienvenue dans le nouveau panneau d’administration Decidim.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Pièces jointes
-          categories:
-            index:
-              categories_title: Catégories
-          participatory_process_steps:
-            index:
-              steps_title: Etapes
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Administrateurs du processus participatifs
       feature_permissions:
         edit:
           everyone: Tout le monde
@@ -377,6 +367,8 @@ fr:
         edit:
           title: Modifier l'étape du processus participatif
           update: Mettre à jour
+        index:
+          steps_title: Etapes
         new:
           create: Créer
           title: Nouvelle étape du processus participatif
@@ -394,6 +386,8 @@ fr:
         edit:
           title: Mettre à jour l'utilisateur du processus participatif.
           update: Mettre à jour
+        index:
+          process_admins_title: Administrateurs du processus participatifs
         new:
           create: Créer
           title: Nouvel utilisateur de processus participatif.
@@ -516,4 +510,4 @@ fr:
   time:
     formats:
       datepicker: "%m / %j / %A"
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"

data/config/locales/it.yml

@@ -111,6 +111,8 @@ it:
         edit:
           title: Modifica allegato
           update: Aggiorna
+        index:
+          attachments_title: Allegati
         new:
           create: Crea allegato
           title: Nuovo allegato
@@ -127,6 +129,8 @@ it:
         edit:
           title: Modifica categoria
           update: Aggiorna
+        index:
+          categories_title: Categorie
         new:
           create: Crea nuova categoria
           title: Nuova categoria
@@ -136,20 +140,6 @@ it:
       dashboard:
         show:
           welcome: Benvenuto nel nuovo pannello di amministarzione.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Allegati
-          categories:
-            index:
-              categories_title: Categorie
-          participatory_process_steps:
-            index:
-              steps_title: Fasi
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Utenti del processo partecipativo.
       exports:
         export_as: "%{name} esporta come %{export_format}"
         notice: Export in fase di elaborazione.  Riceverai un'email quando l'export sarà terminato.
@@ -347,6 +337,8 @@ it:
         edit:
           title: Modifica una fase del processo partecipativo.
           update: Aggiorna
+        index:
+          steps_title: Fasi
         new:
           create: Crea
           title: Nuova fase del processo partecipativo.
@@ -364,6 +356,8 @@ it:
         edit:
           title: Aggiornamento utente di un processo partecipativo.
           update: Aggiorna
+        index:
+          process_admins_title: Utenti del processo partecipativo.
         new:
           create: Crea
           title: Nuovo utente per un processo partecipativo.
@@ -482,4 +476,4 @@ it:
         settings:
           title: Impostazioni
         users:
-          title: Utenti
+          title: Utenti

data/config/routes.rb

@@ -23,6 +23,15 @@ Decidim::Admin::Engine.routes.draw do
       end
       resources :attachments, controller: "participatory_process_attachments"
 
+      resources :moderations do
+        member do
+          put :unreport
+          put :hide
+        end
+      end
+    end
+
+    scope "/participatory_processes/:participatory_process_id" do
       resources :features do
         resource :permissions, controller: "feature_permissions"
         member do
@@ -31,13 +40,6 @@ Decidim::Admin::Engine.routes.draw do
         end
         resources :exports, only: :create
       end
-
-      resources :moderations do
-        member do
-          put :unreport
-          put :hide
-        end
-      end
     end
 
     scope "/participatory_processes/:participatory_process_id/features/:feature_id/manage" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -324,11 +324,11 @@ files:
 - app/helpers/decidim/admin/application_helper.rb
 - app/helpers/decidim/admin/attributes_display_helper.rb
 - app/helpers/decidim/admin/exports_helper.rb
-- app/helpers/decidim/admin/feature_settings_helper.rb
 - app/helpers/decidim/admin/icon_link_helper.rb
 - app/helpers/decidim/admin/menu_helper.rb
 - app/helpers/decidim/admin/process_groups_for_select_helper.rb
 - app/helpers/decidim/admin/processes_for_select_helper.rb
+- app/helpers/decidim/admin/settings_helper.rb
 - app/jobs/decidim/admin/application_job.rb
 - app/jobs/decidim/admin/newsletter_delivery_job.rb
 - app/jobs/decidim/admin/newsletter_job.rb