decidim-admin 0.0.2 → 0.0.3

data/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/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/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/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/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/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/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/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/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/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/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/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/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.

data/config/locales/en.yml

@@ -2,15 +2,21 @@
 en:
   activemodel:
     attributes:
+      attachment:
+        description: Description
+        file: File
+        title: Title
       category:
         description: Description
         name: Name
         parent: Parent
       feature:
         name: Name
+        weight: Weight
       organization:
         default_locale: Default locale
         description: Description
+        favicon: Icon
         homepage_image: Homepage image
         logo: Logo
         name: Name
@@ -26,10 +32,6 @@ en:
         slug: URL slug
         subtitle: Subtitle
         title: Title
-      participatory_process_attachment:
-        description: Description
-        file: File
-        title: Title
       participatory_process_step:
         description: Description
         end_date: End date
@@ -67,6 +69,21 @@ en:
         title: Actions
         unpublish: Unpublish
         verify: Verify
+      attachments:
+        create:
+          error: There was an error creating a new attachment.
+          success: Attachment created successfully.
+        destroy:
+          success: Attachment destroyed successfully.
+        edit:
+          title: Edit attachment
+          update: Update attachment
+        new:
+          create: Create attachment
+          title: New attachment
+        update:
+          error: There was an error when updating this attachment.
+          success: Attachment updated successfully.
       categories:
         create:
           error: There was an error creating this category.
@@ -85,12 +102,12 @@ en:
           success: Category updated successfully.
       decidim:
         admin:
+          attachments:
+            index:
+              attachments_title: Attachments
           categories:
             index:
               categories_title: Categories
-          participatory_process_attachments:
-            index:
-              attachments_title: Attachments
           participatory_process_steps:
             index:
               steps_hint: You can drag the rows of the table in order to reorder the process steps.
@@ -141,6 +158,11 @@ en:
         user_groups: User groups
         users: Admin users
       models:
+        attachment:
+          fields:
+            content_type: Type
+            title: Title
+          name: Attachment
         category:
           fields:
             name: Name
@@ -152,11 +174,6 @@ en:
             published: Published
             title: Title
           name: Participatory process
-        participatory_process_attachment:
-          fields:
-            content_type: Type
-            title: Title
-          name: Attachment
         participatory_process_step:
           fields:
             active: Active
@@ -200,21 +217,6 @@ en:
         update:
           error: There was an error when updating this organization.
           success: Organization updated successfully.
-      participatory_process_attachments:
-        create:
-          error: There was an error creating a new attachment.
-          success: Attachment created successfully.
-        destroy:
-          success: Attachment destroyed successfully.
-        edit:
-          title: Edit attachment
-          update: Update attachment
-        new:
-          create: Create attachment
-          title: New attachment
-        update:
-          error: There was an error when updating this attachment.
-          success: Attachment updated successfully.
       participatory_process_publications:
         create:
           error: There was an error publishing this participatory process.

data/config/locales/es.yml

@@ -1,15 +1,21 @@
 es:
   activemodel:
     attributes:
+      attachment:
+        description: Descripción
+        file: Archivo
+        title: Título
       category:
         description: Descripción
         name: Nombre
         parent: Padre
       feature:
         name: Nombre
+        weight: Peso
       organization:
         default_locale: Configuración regional predeterminada
         description: Descripción
+        favicon: Icono
         homepage_image: Imagen de portada
         logo: Logotipo
         name: Nombre
@@ -25,10 +31,6 @@ es:
         slug: Texto corto de URL
         subtitle: Subtítulo
         title: Título
-      participatory_process_attachment:
-        description: Descripción
-        file: Archivo
-        title: Título
       participatory_process_step:
         description: Descripción
         end_date: Fecha de finalización
@@ -66,6 +68,21 @@ es:
         title: Acciones
         unpublish: Despublicar
         verify: Verificar
+      attachments:
+        create:
+          error: Se ha producido un error al crear un nuevo archivo adjunto.
+          success: Adjunto creado correctamente.
+        destroy:
+          success: El archivo adjunto se ha eliminado correctamente.
+        edit:
+          title: Editar archivo adjunto
+          update: Actualizar archivo adjunto
+        new:
+          create: Crear archivo adjunto
+          title: Nuevo archivo adjunto
+        update:
+          error: Se ha producido un error al actualizar este archivo adjunto.
+          success: Adjunto actualizado correctamente.
       categories:
         create:
           error: Se ha producido un error al crear esta categoría.
@@ -84,12 +101,12 @@ es:
           success: Categoría actualizada correctamente.
       decidim:
         admin:
+          attachments:
+            index:
+              attachments_title: Archivos adjuntos
           categories:
             index:
               categories_title: Categorías
-          participatory_process_attachments:
-            index:
-              attachments_title: Archivos adjuntos
           participatory_process_steps:
             index:
               steps_hint: Puedes arrastrar las filas de la tabla para reordenar las fases del proceso.
@@ -140,6 +157,11 @@ es:
         user_groups: Grupos de usuarios
         users: Administradores
       models:
+        attachment:
+          fields:
+            content_type: Tipo
+            title: Título
+          name: Archivo adjunto
         category:
           fields:
             name: Nombre
@@ -151,11 +173,6 @@ es:
             published: Publicado
             title: Título
           name: Proceso participativo
-        participatory_process_attachment:
-          fields:
-            content_type: Tipo
-            title: Título
-          name: Archivo adjunto
         participatory_process_step:
           fields:
             active: Activa
@@ -199,21 +216,6 @@ es:
         update:
           error: Se produjo un error al actualizar esta organización.
           success: Organización actualizada correctamente.
-      participatory_process_attachments:
-        create:
-          error: Se ha producido un error al crear un nuevo archivo adjunto.
-          success: Adjunto creado correctamente.
-        destroy:
-          success: El archivo adjunto se ha eliminado correctamente.
-        edit:
-          title: Editar archivo adjunto
-          update: Actualizar archivo adjunto
-        new:
-          create: Crear archivo adjunto
-          title: Nuevo archivo adjunto
-        update:
-          error: Se ha producido un error al actualizar este archivo adjunto.
-          success: Adjunto actualizado correctamente.
       participatory_process_publications:
         create:
           error: Se ha producido un error al publicar este proceso participativo.

data/config/routes.rb

@@ -27,7 +27,7 @@ Decidim::Admin::Engine.routes.draw do
         end
       end
 
-      get "/" => proc { raise "Feature not found" }, as: :manage_feature
+      get "/", to: redirect("/404"), as: :manage_feature
     end
 
     resources :static_pages

data/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb

@@ -0,0 +1,9 @@
+class ChangeUserGroupsVerifiedToTimestamp < ActiveRecord::Migration[5.0]
+  def change
+    ActiveRecord::Base.transaction do
+      add_column :decidim_user_groups, :verified_at, :datetime
+      ActiveRecord::Base.connection.execute("UPDATE decidim_user_groups SET verified_at = '#{Time.current.to_s(:db)}' WHERE verified = 't'")
+      remove_column :decidim_user_groups, :verified
+    end
+  end
+end

data/lib/decidim/admin/engine.rb

@@ -7,7 +7,6 @@ require "devise-i18n"
 require "decidim/core"
 require "jquery-rails"
 require "sassc-rails"
-require "turbolinks"
 require "foundation-rails"
 require "foundation_rails_helper"
 require "rectify"
@@ -32,7 +31,8 @@ module Decidim
 
       initializer "decidim_admin.inject_abilities_to_user" do |_app|
         Decidim.configure do |config|
-          config.abilities += [Decidim::Admin::Abilities::AdminUser]
+          config.abilities += ["Decidim::Admin::Abilities::AdminUser"]
+          config.abilities += ["Decidim::Admin::Abilities::ParticipatoryProcessAdmin"]
         end
       end
     end

data/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+RSpec.shared_examples "manage attachments examples" do
+  let!(:attachment) do
+    Decidim::AttachmentUploader.enable_processing = true
+    create(:attachment, attached_to: attached_to)
+  end
+
+  before do
+    visit current_path
+  end
+
+  it "lists all the attachments for the process" do
+    within "#attachments table" do
+      expect(page).to have_content(translated(attachment.title, locale: :en))
+      expect(page).to have_content(attachment.file_type)
+    end
+  end
+
+  it "can view an attachment details" do
+    within "#attachments table" do
+      click_link translated(attachment.title, locale: :en)
+    end
+
+    expect(page).to have_content(stripped(translated(attachment.title, locale: :en)))
+    expect(page).to have_content(stripped(translated(attachment.description, locale: :en)))
+    expect(page).to have_content(attachment.file_type)
+    expect(page).to have_css("img[src~='#{attachment.thumbnail_url}']")
+  end
+
+  it "can add attachments to a process" do
+    find("#attachments .actions .new").click
+
+    within ".new_attachment" do
+      fill_in_i18n(
+        :attachment_title,
+        "#title-tabs",
+        en: "Very Important Document",
+        es: "Documento Muy Importante",
+        ca: "Document Molt Important"
+      )
+
+      fill_in_i18n(
+        :attachment_description,
+        "#description-tabs",
+        en: "This document contains important information",
+        es: "Este documento contiene información importante",
+        ca: "Aquest document conté informació important"
+      )
+
+      attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      find("*[type=submit]").click
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    within "#attachments table" do
+      expect(page).to have_link("Very Important Document")
+    end
+  end
+
+  it "can delete an attachment from a process" do
+    within find("tr", text: stripped(translated(attachment.title))) do
+      click_link "Destroy"
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    expect(page).not_to have_content(translated(attachment.title, locale: :en))
+  end
+
+  it "can update an attachment" do
+    within "#attachments" do
+      within find("tr", text: stripped(translated(attachment.title))) do
+        click_link "Edit"
+      end
+    end
+
+    within ".edit_attachment" do
+      fill_in_i18n(
+        :attachment_title,
+        "#title-tabs",
+        en: "This is a nice photo",
+        es: "Una foto muy guay",
+        ca: "Aquesta foto és ben xula"
+      )
+
+      find("*[type=submit]").click
+    end
+
+    within ".flash" do
+      expect(page).to have_content("successfully")
+    end
+
+    within "#attachments table" do
+      expect(page).to have_link("This is a nice photo")
+    end
+  end
+end