decidim 0.0.2 → 0.0.3

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

@@ -14,6 +14,7 @@ module Decidim
 
       attribute :settings, Object
       attribute :manifest
+      attribute :weight, Integer, default: 0
 
       attribute :step_settings, Hash[String => Object]
       attribute :participatory_process

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

@@ -14,6 +14,7 @@ module Decidim
       attribute :default_locale, String
       attribute :homepage_image
       attribute :logo
+      attribute :favicon
       attribute :show_statistics
 
       translatable_attribute :description, String

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

@@ -11,9 +11,13 @@ module Decidim
       translatable_attribute :subtitle, String
       translatable_attribute :description, String
       translatable_attribute :short_description, String
+      translatable_attribute :domain, String
+      translatable_attribute :scope, String
 
       mimic :participatory_process
 
+      attribute :end_date, Date
+      attribute :developer_group, String
       attribute :slug, String
       attribute :hashtag, String
       attribute :promoted, Boolean
@@ -25,7 +29,10 @@ module Decidim
 
       validate :slug, :slug_uniqueness
 
-      private
+      validates :hero_image, file_size: { less_than_or_equal_to: lambda { |_record| Decidim.maximum_attachment_size } }, file_content_type: { allow: ['image/jpeg', 'image/png'] }
+      validates :banner_image, file_size: { less_than_or_equal_to:lambda { |_record| Decidim.maximum_attachment_size } }, file_content_type: { allow: ['image/jpeg', 'image/png'] }
+
+       private
 
       def slug_uniqueness
         return unless current_organization.participatory_processes.where(slug: slug).where.not(id: id).any?

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

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::LocalizedLocalesHelper
       include Decidim::TranslationsHelper
       include Decidim::HumanizeBooleansHelper
+      include Decidim::AriaSelectedLinkToHelper
 
       def title
         current_organization.name

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This class contains helpers needed in order for feature settings to
+    # properly render.
+    module FeatureSettingsHelper
+      TYPES = {
+        boolean: :check_box,
+        integer: :number_field,
+        string: :text_field,
+        text: :text_area
+      }.freeze
+
+      # Public: Renders a form field that matches a settings attribute's
+      # type.
+      #
+      # form      - The form in which to render the field.
+      # attribute - The FeatureSettings::Attribute instance with the
+      #             description of the attribute.
+      # name      - The name of the field.
+      # options   - Extra options to be passed to the field helper.
+      #
+      # Returns a rendered form field.
+      def settings_attribute_input(form, attribute, name, options = {})
+        form.send(TYPES[attribute.type.to_sym], name, options)
+      end
+    end
+  end
+end

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

@@ -7,9 +7,8 @@ module Decidim
       class AdminUser
         include CanCan::Ability
 
-        def initialize(user)
-          return unless user
-          return unless user.role?(:admin)
+        def initialize(user, _context)
+          return unless user && user.role?(:admin)
 
           can :manage, ParticipatoryProcess
           can :manage, ParticipatoryProcessStep
@@ -25,7 +24,8 @@ module Decidim
 
           can :manage, Feature
           can :read, :admin_dashboard
-          can :manage, ParticipatoryProcessAttachment
+          can :manage, :admin_users
+          can :manage, Attachment
           can :manage, Scope
           can [:create, :index, :new, :read, :invite], User
           can [:destroy], [User] do |user_to_destroy|

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

@@ -9,9 +9,9 @@ module Decidim
       class Base
         include CanCan::Ability
 
-        def initialize(user)
-          merge ::Decidim::Ability.new(user)
-          merge ParticipatoryProcessAdmin.new(user)
+        def initialize(user, context)
+          merge ::Decidim::Ability.new(user, context)
+          merge ParticipatoryProcessAdmin.new(user, context)
         end
       end
     end

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

@@ -11,12 +11,14 @@ module Decidim
       class ParticipatoryProcessAdmin
         include CanCan::Ability
 
-        def initialize(user)
-          return if user.role?(:admin)
-          participatory_processes = ManageableParticipatoryProcessesForUser.for(user)
-          return unless participatory_processes.any?
+        def initialize(user, _context)
+          @user = user
 
-          can :read, :admin_dashboard
+          return unless user && !user.role?(:admin)
+
+          can :read, :admin_dashboard do
+            participatory_processes.any?
+          end
 
           can :manage, ParticipatoryProcess do |process|
             participatory_processes.include?(process)
@@ -25,12 +27,14 @@ module Decidim
           cannot :create, ParticipatoryProcess
           cannot :destroy, ParticipatoryProcess
 
+          cannot :manage, :admin_users
+
           can :manage, ParticipatoryProcessUserRole do |role|
             role.user != user
           end
 
-          can :manage, ParticipatoryProcessAttachment do |step|
-            participatory_processes.include?(step.participatory_process)
+          can :manage, Attachment do |attachment|
+            participatory_processes.include?(attachment.attached_to)
           end
 
           can :manage, ParticipatoryProcessStep do |step|
@@ -45,6 +49,10 @@ module Decidim
             participatory_processes.include?(category.participatory_process)
           end
         end
+
+        def participatory_processes
+          @participatory_processes ||= ManageableParticipatoryProcessesForUser.for(@user)
+        end
       end
     end
   end

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

@@ -0,0 +1,9 @@
+<h3><%= t ".title" %></h3>
+
+<%= form_for(@form, url: url_for([@attachment.attached_to, @attachment])) do |f| %>
+  <%= render partial: 'decidim/admin/attachments/form', object: f %>
+
+  <div class="actions">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,37 @@
+<section id="attachments">
+  <h4><%= t(".attachments_title", scope: "decidim.admin") %></h4>
+
+  <% if can? :create, authorization_object %>
+    <div class="actions title">
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.attachment.name", scope: "decidim.admin")), url_for(action: :new), class: 'new' %>
+    </div>
+  <% end %>
+
+  <% if attached_to.attachments.any? %>
+    <table class="stack">
+      <thead>
+        <tr>
+          <th><%= t("models.attachment.fields.title", scope: "decidim.admin") %></th>
+          <th><%= t("models.attachment.fields.content_type", scope: "decidim.admin") %></th>
+          <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% attached_to.attachments.each do |attachment| %>
+          <tr data-id="<%= attachment.id %>">
+            <td>
+              <%= link_to translated_attribute(attachment.title), polymorphic_path([attached_to, attachment]) %><br />
+            </td>
+            <td>
+              <%= attachment.file_type %>
+            </td>
+            <td class="actions">
+              <%= link_to t("actions.edit", scope: "decidim.admin"), edit_polymorphic_path([attached_to, attachment]) if can? :update, authorization_object %>
+              <%= link_to t("actions.destroy", scope: "decidim.admin"), polymorphic_path([attached_to, attachment]), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, authorization_object %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
+</section>

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

@@ -0,0 +1,9 @@
+<h3><%= t ".title" %></h3>
+
+<%= form_for(@form, url: [attached_to, @form]) do |f| %>
+  <%= render partial: 'decidim/admin/attachments/form', object: f %>
+
+  <div class="actions">
+    <%= f.submit t(".create") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,25 @@
+<h3><%= translated_attribute(@attachment.title) %></h3>
+
+<div class="actions">
+  <hr />
+  <%= link_to t("decidim.admin.actions.edit"), ['edit', @attachment.attached_to, @attachment] if can? :update, @attachment %>
+  <%= link_to t("decidim.admin.actions.destroy"), [@attachment.attached_to, @attachment], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if can? :destroy, @attachment %>
+</div>
+
+<dl>
+  <%= display_for @attachment,
+    :title,
+    :description,
+    :file_type
+    %>
+  <dt><%= display_label(@attachment, :file_size) %></dt>
+  <dd><%= number_to_human_size(@attachment.file_size) %></dd>
+  <dt><%= display_label(@attachment, :file) %></dt>
+  <% if @attachment.photo? %>
+    <%= link_to @attachment.big_url do %>
+      <%= image_tag @attachment.thumbnail_url, class: "thumbnail", alt: strip_tags(translated_attribute(@attachment.description)) %>
+    <% end %>
+  <% else %>
+    <%= link_to translated_attribute(@attachment.title), @attachment.url %>
+  <% end %>
+</dl>

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

@@ -1,5 +1,6 @@
 <div class="field">
   <%= form.translated :text_field, :name, autofocus: true %>
+  <%= form.number_field :weight %>
 
   <% if form.object.settings? %>
     <fieldset class="global-settings">

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

@@ -1,5 +1,8 @@
 <% form.object.manifest.attributes.each do |name, attribute| %>
-  <% if attribute.type == :boolean %>
-    <%= form.check_box name, label: t("decidim.features.#{feature.manifest.name}.settings.#{settings_name}.#{name}") %>
-  <% end %>
+  <%= settings_attribute_input(
+    form,
+    attribute,
+    name,
+    label: t("decidim.features.#{feature.manifest.name}.settings.#{settings_name}.#{name}")
+  )%>
 <% end %>

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

@@ -26,6 +26,10 @@
   <%= form.file_field :logo %>
 </div>
 
+<div class="field">
+  <%= form.file_field :favicon %>
+</div>
+
 <div class="field">
   <%= form.check_box :show_statistics %>
 </div>

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

@@ -33,3 +33,19 @@
 <div class="field">
   <%= form.check_box :promoted %>
 </div>
+
+<div class="field">
+  <%= form.translated :text_field, :domain %>
+</div>
+
+<div class="field">
+  <%= form.translated :text_field, :scope %>
+</div>
+
+<div class="field">
+  <%= form.text_field :developer_group %>
+</div>
+
+<div class="field">
+  <%= form.date_field :end_date %>
+</div>

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

@@ -5,9 +5,19 @@
     :hashtag,
     :slug,
     :short_description,
-    :description
+    :description,
+    :scope,
+    :domain,
+    :developer_group
   %>
 
+  <dt><%= display_label(participatory_process, :end_date) %></dt>
+  <dd>
+    <% if participatory_process.end_date %>
+      <%=  l(participatory_process.end_date, format: :long) %>
+    <% end %>
+  </dd>
+
   <dt><%= display_label(participatory_process, :hero_image) %></dt>
   <dd>
     <% if participatory_process.hero_image? %>

data/decidim-admin/app/views/layouts/decidim/admin/_header.html.erb

@@ -1,4 +1,4 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= stylesheet_link_tag    'decidim/admin/application', media: 'all', 'data-turbolinks-track': 'reload' %>
-<%= javascript_include_tag 'decidim/admin/application', 'data-turbolinks-track': 'reload' %>
+<%= stylesheet_link_tag    'decidim/admin/application', media: 'all' %>
+<%= javascript_include_tag 'decidim/admin/application' %>

data/decidim-admin/app/views/layouts/decidim/admin/_sidebar.html.erb

@@ -11,7 +11,7 @@
   <%= active_link_to t("menu.participatory_processes", scope: "decidim.admin"), decidim_admin.participatory_processes_path, active: :inclusive %>
   <%= active_link_to t("menu.static_pages", scope: "decidim.admin"), decidim_admin.static_pages_path, active: :inclusive if can? :read, Decidim::StaticPage %>
   <%= active_link_to t("menu.scopes", scope: "decidim.admin"), decidim_admin.scopes_path, active: :inclusive if can? :read, Decidim::Scope %>
-  <%= active_link_to t("menu.users", scope: "decidim.admin"), decidim_admin.users_path, active: :inclusive if can? :read, Decidim::User %>
+  <%= active_link_to t("menu.users", scope: "decidim.admin"), decidim_admin.users_path, active: :inclusive if can? :read, :admin_users %>
   <%= active_link_to t("menu.user_groups", scope: "decidim.admin"), decidim_admin.user_groups_path, active: :inclusive if can? :index, Decidim::UserGroup %>
   <%= active_link_to t("menu.settings", scope: "decidim.admin"), decidim_admin.edit_organization_path, active: :inclusive if can? :read, current_organization %>
 </nav>

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

@@ -31,9 +31,9 @@
             <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_user_roles_path(participatory_process) %>
           </li>
         <% end %>
-        <% if can? :read, Decidim::ParticipatoryProcessAttachment %>
+        <% if can? :read, Decidim::Attachment %>
           <li class="tabs-title">
-            <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_attachments_path(participatory_process) %>
+            <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_attachments_path(participatory_process.id) %>
           </li>
         <% end %>
         <% if can? :update, participatory_process %>

data/decidim-admin/config/locales/ca.yml

@@ -1,15 +1,21 @@
 ca:
   activemodel:
     attributes:
+      attachment:
+        description: Descripció
+        file: Arxiu
+        title: Títol
       category:
         description: Descripció
         name: Nom
         parent: Pare
       feature:
         name: Nom
+        weight: Pes
       organization:
         default_locale: Idioma per defecte
         description: Descripció
+        favicon: Icona
         homepage_image: Imatge de la portada
         logo: Logotip
         name: Nom
@@ -25,10 +31,6 @@ ca:
         slug: Nom curt d'URL
         subtitle: Subtítol
         title: Títol
-      participatory_process_attachment:
-        description: Descripció
-        file: Arxiu
-        title: Títol
       participatory_process_step:
         description: Descripció
         end_date: Data de finalització
@@ -66,6 +68,21 @@ ca:
         title: Accions
         unpublish: Despublicar
         verify: Verificar
+      attachments:
+        create:
+          error: S'ha produït un error en crear un nou arxiu adjunt.
+          success: Adjunt creat correctament.
+        destroy:
+          success: L'adjunt s'ha eliminat correctament.
+        edit:
+          title: Edita arxiu adjunt
+          update: Actualitza adjunt
+        new:
+          create: Crea arxiu adjunt
+          title: Nou arxiu adjunt
+        update:
+          error: S'ha produït un error en actualitzar aquest arxiu adjunt.
+          success: Adjunt actualitzat correctament.
       categories:
         create:
           error: S'ha produït un error en crear aquesta categoria.
@@ -84,12 +101,12 @@ ca:
           success: Categoria actualitzada correctament.
       decidim:
         admin:
+          attachments:
+            index:
+              attachments_title: Adjunts
           categories:
             index:
               categories_title: Categories
-          participatory_process_attachments:
-            index:
-              attachments_title: Adjunts
           participatory_process_steps:
             index:
               steps_hint: Pots arrossegar les files de la taula per reordenar les fases del procés.
@@ -140,6 +157,11 @@ ca:
         user_groups: Grups d'usuaris
         users: Administradors
       models:
+        attachment:
+          fields:
+            content_type: Tipus
+            title: Títol
+          name: Arxiu adjunt
         category:
           fields:
             name: Nom
@@ -151,11 +173,6 @@ ca:
             published: Publicat
             title: Títol
           name: Procés participatiu
-        participatory_process_attachment:
-          fields:
-            content_type: Tipus
-            title: Títol
-          name: Accessori
         participatory_process_step:
           fields:
             active: Activa
@@ -199,21 +216,6 @@ ca:
         update:
           error: S'ha produït un error en actualitzar aquesta organització.
           success: Organització actualitzada correctament.
-      participatory_process_attachments:
-        create:
-          error: S'ha produït un error en crear un nou arxiu adjunt.
-          success: Adjunt creat correctament.
-        destroy:
-          success: L'adjunt s'ha eliminat correctament.
-        edit:
-          title: Edita arxiu adjunt
-          update: Actualitza adjunt
-        new:
-          create: Crear arxiu adjunt
-          title: Nou arxiu adjunt
-        update:
-          error: S'ha produït un error en actualitzar aquest arxiu adjunt.
-          success: Adjunt actualitzat correctament.
       participatory_process_publications:
         create:
           error: S'ha produït un error en publicar aquest procés participatiu.