decidim 0.0.1.alpha7 → 0.0.1.alpha8

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

@@ -10,6 +10,8 @@
   <thead>
     <tr>
       <th><%= t("models.participatory_process.fields.title", scope: "decidim.admin") %></th>
+      <th><%= t("models.participatory_process.fields.promoted", scope: "decidim.admin") %></th>
+      <th><%= t("models.participatory_process.fields.published", scope: "decidim.admin") %></th>
       <th><%= t("models.participatory_process.fields.created_at", scope: "decidim.admin") %></th>
       <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
     </tr>
@@ -20,13 +22,31 @@
         <td>
           <%= link_to translated_attribute(process.title), process %><br />
         </td>
+        <td>
+          <%= humanize_boolean process.promoted? %>
+        </td>
+        <td>
+          <%= humanize_boolean process.published? %>
+        </td>
         <td>
           <%= l process.created_at, format: :short %>
         </td>
         <td class="actions">
-          <%= link_to_if policy(process).edit?, t("actions.edit", scope: "decidim.admin"), ['edit', process] %>
+          <% if can? :update, process %>
+            <%= link_to t("actions.edit", scope: "decidim.admin"), ['edit', process] %>
+          <% end %>
+
+          <% if can? :publish, process %>
+            <% if process.published? %>
+              <%= link_to t("actions.unpublish", scope: "decidim.admin"), participatory_process_publish_path(process), method: :delete, class: "small button secondary" %>
+            <% else %>
+              <%= link_to t("actions.publish", scope: "decidim.admin"), participatory_process_publish_path(process), method: :post, class: "small button secondary" %>
+            <% end %>
+          <% end %>
 
-          <%= link_to_if policy(process).destroy?, t("actions.destroy", scope: "decidim.admin"), process, method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+          <% if can? :destroy, process %>
+            <%= link_to t("actions.destroy", scope: "decidim.admin"), process, method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+          <% end %>
         </td>
       </tr>
     <% end %>

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

@@ -5,8 +5,21 @@
 
 <div class="actions">
   <hr />
-  <%= link_to_if policy(@participatory_process).edit?, t("decidim.admin.actions.edit"), ['edit', @participatory_process] %>
-  <%= link_to_if policy(@participatory_process).destroy?, t("decidim.admin.actions.destroy"), @participatory_process, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
+  <% if can? :update, @participatory_process %>
+    <%= link_to t("decidim.admin.actions.edit"), ['edit', @participatory_process] %>
+  <% end %>
+
+  <% if can? :publish, @participatory_process %>
+    <% if @participatory_process.published? %>
+      <%= link_to t("actions.unpublish", scope: "decidim.admin"), participatory_process_publish_path(@participatory_process), method: :delete, class: "small button secondary" %>
+    <% else %>
+      <%= link_to t("actions.publish", scope: "decidim.admin"), participatory_process_publish_path(@participatory_process), method: :post, class: "small button secondary" %>
+    <% end %>
+  <% end %>
+
+  <% if can? :destroy, @participatory_process %>
+    <%= link_to t("decidim.admin.actions.destroy"), @participatory_process, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
+  <% end %>
 </div>
 
 <dl>
@@ -22,4 +35,10 @@
   <dd><%= image_tag @participatory_process.hero_image.url.to_s %></dd>
   <dt><%= display_label(@participatory_process, :banner_image) %></dt>
   <dd><%= image_tag @participatory_process.banner_image.url.to_s %></dd>
+  <dt><%= display_label(@participatory_process, :promoted) %></dt>
+  <dd><%= humanize_boolean @participatory_process.promoted? %></dd>
 </dl>
+
+<% if can? :read, Decidim::ParticipatoryProcessStep %>
+  <%= render partial: "decidim/admin/participatory_process_steps/table" %>
+<% end %>

data/decidim-admin/config/i18n-tasks.yml

@@ -88,8 +88,8 @@ search:
 # - '{devise,simple_form}.*'
 
 ## Consider these keys used:
-# ignore_unused:
-# - 'activerecord.attributes.*'
+ignore_unused:
+- activerecord.attributes.decidim/participatory_process.*
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

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

@@ -1,14 +1,27 @@
 ---
 ca:
+  activerecord:
+    attributes:
+      decidim/participatory_process:
+        promoted: Destacat
   decidim:
     admin:
       actions:
+        activate: Activar
         confirm_destroy: Segur que ho vols eliminar?
+        deactivate: Desactivar
         destroy: Eliminar
         edit: Editar
         new: Nou %{name}
+        publish: Publicar
         title: Accions
-        unauthorized: No tens permís per realitzar aquesta acció.
+        unpublish: Despublicar
+      decidim:
+        admin:
+          participatory_process_steps:
+            table:
+              steps_hint: Pots arrossegar les files de la taula per reordenar les fases del procés.
+              steps_title: Fases
       menu:
         dashboard: Tauler de control
         participatory_processes: Processos participatius
@@ -16,14 +29,54 @@ ca:
         participatory_process:
           fields:
             created_at: Data de creació
+            promoted: Destacat
+            published: Publicat
             title: Títol
           name: Procés participatiu
           validations:
             slug_uniqueness: Ja existeix un altre procés participatiu amb el mateix identificador
+        participatory_process_step:
+          fields:
+            active: Active
+            end_date: Data de finalització
+            start_date: Data d'inici
+            title: Títol
+          name: Name
+      participatory_process_publications:
+        create:
+          error: S'ha produït un error en publicar aquest procés participatiu.
+          success: El procés participatiu s'ha publicat correctament.
+        destroy:
+          error: S'ha produït un error en despublicar aquest procés participatiu.
+          success: El procés participatiu s'ha despublicat correctament.
+      participatory_process_step_activations:
+        create:
+          error: S'ha produït un error en activar aquesta fase de procés participatiu.
+          success: La fase de procés participatiu s'ha activat correctament.
+        destroy:
+          error: S'ha produït un error en desactivar aquesta fase de procés participatiu.
+          success: La fase de procés participatiu s'ha desactivat correctament.
+      participatory_process_steps:
+        create:
+          error: S'ha produït un error en crear una nova fase de procés participatiu.
+          success: La fase de procés participatiu s'ha creat correctament.
+        destroy:
+          success: La fase de procés participatiu s'ha eliminat correctament.
+        edit:
+          title: Editar fase de procés participatiu
+          update: Actualitzar fase de procés participatiu
+        new:
+          create: Crear fase de procés participatiu
+          title: Nova fase de procés participatiu
+        ordering:
+          error: S'ha produït un error en la reordenació de les fases d'aquest procés participatiu.
+        update:
+          error: S'ha produït un error en l'actualització d'aquesta fase de procés participatiu.
+          success: La fase de procés participatiu s'ha actualitzat correctament.
       participatory_processes:
         create:
           error: S'ha produït un error en crear un nou procés participatiu.
-          success: El procés participatiu s'ha creat correctament.
+          success: El procés participatiu s'ha creat correctament. Continua ara amb la configuració de les fases.
         destroy:
           success: El procés participatiu s'ha eliminat correctament.
         edit:

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

@@ -1,14 +1,27 @@
 ---
 en:
+  activerecord:
+    attributes:
+      decidim/participatory_process:
+        promoted: Highlighted
   decidim:
     admin:
       actions:
+        activate: Activate
         confirm_destroy: Are you sure you want to delete this?
+        deactivate: Deactivate
         destroy: Destroy
         edit: Edit
         new: New %{name}
+        publish: Publish
         title: Actions
-        unauthorized: You are not authorized to perform this action
+        unpublish: Unpublish
+      decidim:
+        admin:
+          participatory_process_steps:
+            table:
+              steps_hint: You can drag the rows of the table in order to reorder the process steps.
+              steps_title: Steps
       menu:
         dashboard: Dashboard
         participatory_processes: Participatory processes
@@ -16,14 +29,54 @@ en:
         participatory_process:
           fields:
             created_at: Created at
+            promoted: Highlighted
+            published: Published
             title: Title
           name: Participatory process
           validations:
             slug_uniqueness: Another participatory process with the same slug already exists
+        participatory_process_step:
+          fields:
+            active: Active
+            end_date: End date
+            start_date: Start date
+            title: Title
+          name: Participatory process step
+      participatory_process_publications:
+        create:
+          error: There was an error publishing this participatory process.
+          success: Participatory process published successfully
+        destroy:
+          error: There was an error unpublishing this participatory process.
+          success: Participatory process unpublished successfully
+      participatory_process_step_activations:
+        create:
+          error: There was an error activating this participatory process step.
+          success: Participatory process step activated successfully
+        destroy:
+          error: There was an error deactivating this participatory process step.
+          success: Participatory process step deactivated successfully
+      participatory_process_steps:
+        create:
+          error: There was an error creating a new participatory process step.
+          success: Participatory process step created successfully
+        destroy:
+          success: Participatory process step successfully destroyed
+        edit:
+          title: Edit participatory process step
+          update: Update participatory process step
+        new:
+          create: Create participatory process step
+          title: New participatory process step
+        ordering:
+          error: There was an error when reordering this participatory process steps.
+        update:
+          error: There was an error when updating this participatory process step.
+          success: Participatory process step updated successfully
       participatory_processes:
         create:
           error: There was an error creating a new participatory process.
-          success: Participatory process created successfully
+          success: Participatory process created successfully. Configure now its steps.
         destroy:
           success: Participatory process successfully destroyed
         edit:

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

@@ -1,14 +1,27 @@
 ---
 es:
+  activerecord:
+    attributes:
+      decidim/participatory_process:
+        promoted: Destacado
   decidim:
     admin:
       actions:
-        confirm_destroy: ¿Seguro que lo quieres eliminar?
+        activate: Activar
+        confirm_destroy: "¿Seguro que lo quieres eliminar?"
+        deactivate: Desactivar
         destroy: Eliminar
         edit: Editar
         new: Nuevo %{name}
+        publish: Publicar
         title: Acciones
-        unauthorized: No tienes permiso para realizar esta acción.
+        unpublish: Despublicar
+      decidim:
+        admin:
+          participatory_process_steps:
+            table:
+              steps_hint: Puedes arrastrar las filas de la tabla para reordenar las fases del proceso.
+              steps_title: Fases
       menu:
         dashboard: Panel de control
         participatory_processes: Procesos participativos
@@ -16,14 +29,54 @@ es:
         participatory_process:
           fields:
             created_at: Fecha de creación
+            promoted: Destacado
+            published: Publicado
             title: Título
           name: Proceso participativo
           validations:
             slug_uniqueness: Ya existe otro proceso participativo con el mismo identificador
+        participatory_process_step:
+          fields:
+            active: Activo
+            end_date: Fecha de finalización
+            start_date: Fecha de inicio
+            title: Título
+          name: Fase de proceso participativo
+      participatory_process_publications:
+        create:
+          error: Se ha producido un error al publicar este proceso participativo.
+          success: El proceso participativo se ha publicado correctamente.
+        destroy:
+          error: Se ha producido un error al despublicar este proceso participativo.
+          success: El proceso participativo se ha despublicado correctamente.
+      participatory_process_step_activations:
+        create:
+          error: Se ha producido un error al activar esta fase de proceso participativo.
+          success: La fase de proceso participativo se ha activado correctamente.
+        destroy:
+          error: Se ha producido un error al desactivar esta fase de proceso participativo.
+          success: La fase de proceso participativo se ha desactivado correctamente.
+      participatory_process_steps:
+        create:
+          error: Se ha producido un error al crear una nueva fase de proceso participativo.
+          success: La fase de proceso participativo se ha creado correctamente.
+        destroy:
+          success: La fase de proceso participativo se ha eliminado correctamente.
+        edit:
+          title: Editar fase de proceso participativo
+          update: Actualizar fase de proceso participativo
+        new:
+          create: Crear fase de proceso participativo
+          title: Nuevo fase de proceso participativo
+        ordering:
+          error: Se ha producido un error en la reordenación de las fases de este proceso participativo.
+        update:
+          error: Se ha producido un error en la actualización de esta fase de proceso participativo.
+          success: La fase de proceso participativo se ha actualizado correctamente.
       participatory_processes:
         create:
           error: Se ha producido un error al crear un nuevo proceso participativo.
-          success: El proceso participativo se ha creado correctamente.
+          success: El proceso participativo se ha creado correctamente. Sigue ahora con la configuración de las fases.
         destroy:
           success: El proceso participativo se ha eliminado correctamente.
         edit:

data/decidim-admin/config/routes.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 Decidim::Admin::Engine.routes.draw do
   constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
-    resources :participatory_processes
+    resources :participatory_processes do
+      resource :publish, controller: "participatory_process_publications", only: [:create, :destroy]
+
+      resources :steps, controller: "participatory_process_steps", except: :index do
+        resource :activate, controller: "participatory_process_step_activations", only: [:create, :destroy]
+        collection do
+          post :ordering, to: "participatory_process_step_ordering#create"
+        end
+      end
+    end
     root to: "dashboard#show"
   end
 end

data/decidim-admin/decidim-admin.gemspec

@@ -13,26 +13,25 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = "Organization administration"
   s.description = "Organization administration to manage a single organization."
-  s.license     = "MIT"
+  s.license     = "AGPLv3"
 
-  s.files = Dir["{app,config,db,lib,vendor}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
 
   s.add_dependency "decidim-core", Decidim.version
   s.add_dependency "rails", Decidim.rails_version
   s.add_dependency "devise", "~> 4.2"
   s.add_dependency "devise-i18n", "~> 1.1.0"
-  s.add_dependency "rectify", "~> 0.6"
+  s.add_dependency "rectify", "~> 0.7.1"
   s.add_dependency "devise_invitable", "~> 1.7.0"
-  s.add_dependency "foundation-rails", "~> 6.2.3.0"
+  s.add_dependency "foundation-rails", "~> 6.2.4.0"
   s.add_dependency "sass-rails", "~> 5.0.0"
   s.add_dependency "jquery-rails", "~> 4.0"
   s.add_dependency "turbolinks", Decidim.rails_version
   s.add_dependency "jbuilder", "~> 2.5"
   s.add_dependency "foundation_rails_helper", "~> 2.0.0"
   s.add_dependency "active_link_to", "~> 1.0.0"
-  s.add_dependency "pundit", "~> 1.1.0"
-  s.add_dependency "carrierwave", "~> 1.0.0.beta"
+  s.add_dependency "carrierwave", "~> 1.0.0.rc"
+  s.add_dependency "cancancan", "~> 1.15.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
-  s.add_development_dependency "pundit-matchers", "~> 1.1.0"
 end

data/decidim-admin/lib/decidim/admin/engine.rb

@@ -12,7 +12,6 @@ require "foundation-rails"
 require "foundation_rails_helper"
 require "jbuilder"
 require "rectify"
-require "pundit"
 
 module Decidim
   module Admin
@@ -23,6 +22,12 @@ module Decidim
       initializer "decidim_admin.assets" do |app|
         app.config.assets.precompile += %w(decidim_admin_manifest.js)
       end
+
+      initializer "decidim_admin.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.abilities += [Decidim::Admin::Abilities::Admin]
+        end
+      end
     end
   end
 end

data/decidim-admin/spec/commands/activate_participatory_process_step_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe Decidim::Admin::ActivateParticipatoryProcessStep do
+  let(:process_step) { create :participatory_process_step }
+
+  subject { described_class.new(process_step) }
+
+  context "when the step is nil" do
+    let(:process_step) { nil }
+
+    it "is not valid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+
+  context "when the step is active" do
+    let(:process_step) { create :participatory_process_step, :active }
+
+    it "is not valid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+
+  context "when the step is not active" do
+    let!(:active_step) do
+      create :participatory_process_step, :active, participatory_process: process_step.participatory_process
+    end
+
+    it "is valid" do
+      expect { subject.call }.to broadcast(:ok)
+    end
+
+    it "activates it" do
+      subject.call
+      expect(process_step).to be_active
+    end
+
+    it "deactivates the process active steps" do
+      subject.call
+      active_step.reload
+      expect(active_step).not_to be_active
+    end
+  end
+end