decidim 0.0.3 → 0.0.4

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

@@ -12,7 +12,7 @@
   <% end %>
 </div>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t "decidim.admin.titles.participatory_processes" %></h2>
 <% end %>
 

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

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -7,8 +7,11 @@
     :short_description,
     :description,
     :scope,
-    :domain,
-    :developer_group
+    :developer_group,
+    :local_area,
+    :target,
+    :participatory_scope,
+    :participatory_structure
   %>
 
   <dt><%= display_label(participatory_process, :end_date) %></dt>

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

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t "decidim.admin.titles.scopes" %></h2>
 <% end %>
 

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

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -9,5 +9,5 @@
 <% end %>
 
 <div class="field">
-  <%= form.translated :editor, :content %>
+  <%= form.translated :editor, :content, toolbar: :full %>
 </div>

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

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t "decidim.admin.titles.static_pages" %></h2>
 <% end %>
 

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

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= link_to translated_attribute(@page.title), @page %></h2>
 <% end %>
 

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

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t "decidim.admin.titles.user_groups" %></h2>
 <% end %>
 

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

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t "decidim.admin.titles.users" %></h2>
 <% end %>
 

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

@@ -1,8 +1,8 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t ".title" %></h2>
 <% end %>
 
-<%= form_for(@form) do |f| %>
+<%= decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,4 +1,4 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= link_to translated_attribute(participatory_process.title), decidim_admin.participatory_process_path(participatory_process) %></h2>
   <h3 class="subheader"><%= translated_attribute(participatory_process.subtitle) %></h3>
 <% end %>

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

@@ -89,9 +89,10 @@ search:
 
 ## Consider these keys used:
 ignore_unused:
-- activerecord.attributes.*
-- activemodel.attributes.*
-- decidim.admin.participatory_process_steps.default_title
+ - activerecord.attributes.*
+ - activemodel.attributes.*
+ - decidim.admin.participatory_process_steps.default_title
+ - activemodel.errors.messages.*
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

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

@@ -24,9 +24,13 @@ ca:
       participatory_process:
         banner_image: Imatge de bandera
         description: Descripció
+        developer_group: Grup promotor
+        domain: Àrees municipals
+        end_date: Data de finalització
         hashtag: Etiqueta
         hero_image: Imatge de portada
         promoted: Promogut
+        scope: Àmbit
         short_description: Descripció breu
         slug: Nom curt d'URL
         subtitle: Subtítol
@@ -47,6 +51,9 @@ ca:
         organization: Organització
         slug: Nom curt d'URL
         title: Títol
+    errors:
+      messages:
+        invalid_json: JSON no vàlid
   activerecord:
     attributes:
       decidim/participatory_process:
@@ -62,6 +69,7 @@ ca:
         edit: Editar
         manage: Gestionar
         new: Nou %{name}
+        permissions: Permisos
         preview: Previsualitzar
         publish: Publicar
         resend_invitation: Tornar a enviar invitació
@@ -114,13 +122,20 @@ ca:
           participatory_process_user_roles:
             index:
               process_admins_title: Administradors del procés participatiu
+      feature_permissions:
+        edit:
+          everyone: Tothom
+          submit: Desar permisos
+          title: Permisos d'edició
+        update:
+          success: Permisos actualitzats correctament.
       features:
         create:
           error: S'ha produït un error en afegir aquesta funcionalitat.
           success: Funcionalitat creada correctament.
         destroy:
           error: S'ha produït un error destruir aquesta funcionalitat.
-          success: Característica eliminada correctament.
+          success: Funcionalitat eliminada correctament.
         edit:
           title: Editar funcionalitat
           update: Actualitza
@@ -136,7 +151,11 @@ ca:
         new:
           add: Afegir funcionalitat
           title: 'Afegir funcionalitat: %{name}'
+        publish:
+          success: La funcionalitat s'ha publicat correctament.
         title: Funcionalitats
+        unpublish:
+          success: La funcionalitat ha estat despublicada exitosament.
         update:
           error: S'ha produït un error en actualitzar aquesta funcionalitat.
           success: La funcionalitat s'ha actualitzat correctament.

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

@@ -25,9 +25,13 @@ en:
       participatory_process:
         banner_image: Banner image
         description: Description
+        developer_group: Developer group
+        domain: Domain
+        end_date: End date
         hashtag: Hashtag
         hero_image: Home image
         promoted: Promoted
+        scope: Scope
         short_description: Short description
         slug: URL slug
         subtitle: Subtitle
@@ -48,6 +52,9 @@ en:
         organization: Organization
         slug: URL slug
         title: Title
+    errors:
+      messages:
+        invalid_json: Invalid JSON
   activerecord:
     attributes:
       decidim/participatory_process:
@@ -63,6 +70,7 @@ en:
         edit: Edit
         manage: Manage
         new: New %{name}
+        permissions: Permissions
         preview: Preview
         publish: Publish
         resend_invitation: Resend invitation
@@ -115,6 +123,13 @@ en:
           participatory_process_user_roles:
             index:
               process_admins_title: Participatory process admins
+      feature_permissions:
+        edit:
+          everyone: Everyone
+          submit: Save permissions
+          title: Edit permissions
+        update:
+          success: Permissions updated successfully.
       features:
         create:
           error: There was an error creating this feature.
@@ -137,7 +152,11 @@ en:
         new:
           add: Add feature
           title: 'Add feature: %{name}'
+        publish:
+          success: The feature has been successfully published.
         title: Features
+        unpublish:
+          success: The feature has been successfully unpublished.
         update:
           error: There has been an error updating this feature.
           success: The feature was updated successfully.

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

@@ -24,9 +24,13 @@ es:
       participatory_process:
         banner_image: Imagen de bandera
         description: Descripción
+        developer_group: Grupo promotor
+        domain: Dominio
+        end_date: Fecha de finalización
         hashtag: Hashtag
         hero_image: Imagen de portada
         promoted: Destacado
+        scope: Ámbito
         short_description: Breve descripción
         slug: Texto corto de URL
         subtitle: Subtítulo
@@ -47,6 +51,9 @@ es:
         organization: Organización
         slug: Texto corto de URL
         title: Título
+    errors:
+      messages:
+        invalid_json: JSON no válido
   activerecord:
     attributes:
       decidim/participatory_process:
@@ -62,6 +69,7 @@ es:
         edit: Editar
         manage: Gestionar
         new: Nuevo %{name}
+        permissions: Permisos
         preview: Previsualizar
         publish: Publicar
         resend_invitation: Reenviar invitación
@@ -114,6 +122,13 @@ es:
           participatory_process_user_roles:
             index:
               process_admins_title: Administradores del proceso participativo
+      feature_permissions:
+        edit:
+          everyone: Todo el mundo
+          submit: Guardar permisos
+          title: Editar permisos
+        update:
+          success: Permisos actualizados correctamente.
       features:
         create:
           error: Se ha producido un error al añadir esta funcionalidad.
@@ -136,7 +151,11 @@ es:
         new:
           add: Añadir funcionalidad
           title: 'Añadir funcionalidad: %{name}'
+        publish:
+          success: La funcionalidad se ha publicado correctamente.
         title: Funcionalidades
+        unpublish:
+          success: La funcionalidad se ha despublicado correctamente.
         update:
           error: Se ha producido un error al actualizar esta funcionalidad.
           success: La funcionalidad se ha actualizado correctamente.

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

@@ -0,0 +1,5 @@
+eu:
+  activemodel:
+    attributes:
+      attachment:
+        description: Deskribapena

data/decidim-admin/config/routes.rb

@@ -15,7 +15,14 @@ Decidim::Admin::Engine.routes.draw do
       end
       resources :user_roles, controller: "participatory_process_user_roles", only: [:destroy, :create, :index]
       resources :attachments, controller: "participatory_process_attachments"
-      resources :features
+
+      resources :features do
+        resource :permissions, controller: "feature_permissions"
+        member do
+          put :publish
+          put :unpublish
+        end
+      end
     end
 
     scope "/participatory_processes/:participatory_process_id/features/:feature_id/manage" do

data/decidim-admin/db/seeds.rb

@@ -10,7 +10,9 @@ if !Rails.env.production? || ENV["SEED"]
     confirmed_at: Time.current,
     locale: I18n.default_locale,
     organization: staging_organization,
-    tos_agreement: true
+    tos_agreement: true,
+    comments_notifications: true,
+    replies_notifications: true
   )
 
   Decidim::Admin::ParticipatoryProcessUserRole.create!(

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

@@ -30,6 +30,25 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
     end
   end
 
+  context "when a user and a role already exist" do
+    before do
+      create(
+        :participatory_process_user_role,
+        user: user,
+        role: :admin,
+        participatory_process: my_process
+      )
+    end
+
+    it "is not valid" do
+      form_errors = double
+      expect(form_errors).to receive(:add).with(:email, :taken)
+      expect(form).to receive(:errors).and_return(form_errors)
+
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+
   context "when everything is ok" do
     it "creates the user role" do
       subject.call

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

@@ -48,6 +48,26 @@ module Decidim
           end
         end
 
+        describe "when the organization is not valid" do
+          before do
+            expect(form).to receive(:invalid?).and_return(false)
+            expect(organization).to receive(:valid?).at_least(:once).and_return(false)
+            organization.errors.add(:official_img_header, "Image too big")
+            organization.errors.add(:official_img_footer, "Image too big")
+          end
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+
+          it "adds errors to the form" do
+            command.call
+
+            expect(form.errors[:official_img_header]).not_to be_empty
+            expect(form.errors[:official_img_footer]).not_to be_empty
+          end
+        end
+
         describe "when the form is valid" do
           it "broadcasts ok" do
             expect { command.call }.to broadcast(:ok)

data/decidim-admin/spec/features/admin_invite_spec.rb

@@ -28,9 +28,11 @@ describe "Admin invite", type: :feature do
     it "asks for a password and redirects to the organization dashboard" do
       visit last_email_link
 
-      fill_in :user_password, with: "123456"
-      fill_in :user_password_confirmation, with: "123456"
-      find("*[type=submit]").click
+      within "form.new_user" do
+        fill_in :user_password, with: "123456"
+        fill_in :user_password_confirmation, with: "123456"
+        find("*[type=submit]").click
+      end
 
       expect(page).to have_content("Dashboard")
     end