decidim-admin 0.0.3 → 0.0.5

data/config/locales/en.yml

@@ -13,6 +13,9 @@ en:
       feature:
         name: Name
         weight: Weight
+      newsletter:
+        body: Body
+        subject: Subject
       organization:
         default_locale: Default locale
         description: Description
@@ -25,9 +28,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 +55,9 @@ en:
         organization: Organization
         slug: URL slug
         title: Title
+    errors:
+      messages:
+        invalid_json: Invalid JSON
   activerecord:
     attributes:
       decidim/participatory_process:
@@ -63,6 +73,7 @@ en:
         edit: Edit
         manage: Manage
         new: New %{name}
+        permissions: Permissions
         preview: Preview
         publish: Publish
         resend_invitation: Resend invitation
@@ -115,6 +126,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,12 +155,17 @@ 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.
       menu:
         dashboard: Dashboard
+        newsletters: Newsletters
         participatory_processes: Participatory processes
         participatory_processes_submenu:
           attachments: Attachments
@@ -167,6 +190,13 @@ en:
           fields:
             name: Name
           name: Category
+        newsletter:
+          fields:
+            created_at: Created at
+            progress: Progress
+            sent_at: Sent at
+            subject: Subject
+          name: Newsletter
         participatory_process:
           fields:
             created_at: Created at
@@ -210,6 +240,35 @@ en:
             name: Name
             phone: Phone
             users_count: Users count
+      newsletters:
+        create:
+          error: There's been an error creating this newsletter.
+          success: Newsletter created successfully. Please, review it before sending.
+        deliver:
+          error: There's been an error delivering this newsletter.
+          success: Newsletter delivered successfully.
+        destroy:
+          error_already_sent: 'Can''t destroy newsletter: It has already been sent.'
+          success: Newsletter destroyed successfully.
+        edit:
+          save_and_preview: Save and preview
+          title: Edit newsletter
+        form:
+          interpolations_hint: 'Hint: You can use "%{name}" anywhere in the body or subject and it will be replaced by the recipient''s name.'
+        index:
+          confirm_delete: Are you sure you want to delete this newsletter?
+          title: Newsletters
+        new:
+          save: Save
+          title: New newsletter
+        show:
+          confirm_deliver: Are you sure you want to deliver this newsletter? This action cannot be undone.
+          deliver: Deliver newsletter
+          preview: Preview
+          subject: Subject
+        update:
+          error: There's been an error updating this newsletter.
+          success: Newsletter updated successfully. Please review it before sending.
       organization:
         edit:
           title: Edit organization

data/config/locales/es.yml

@@ -12,6 +12,9 @@ es:
       feature:
         name: Nombre
         weight: Peso
+      newsletter:
+        body: Cuerpo
+        subject: Asunto
       organization:
         default_locale: Configuración regional predeterminada
         description: Descripción
@@ -24,9 +27,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 +54,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 +72,7 @@ es:
         edit: Editar
         manage: Gestionar
         new: Nuevo %{name}
+        permissions: Permisos
         preview: Previsualizar
         publish: Publicar
         resend_invitation: Reenviar invitación
@@ -114,6 +125,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,12 +154,17 @@ 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.
       menu:
         dashboard: Panel de control
+        newsletters: Boletines
         participatory_processes: Procesos participativos
         participatory_processes_submenu:
           attachments: Archivos adjuntos
@@ -166,6 +189,13 @@ es:
           fields:
             name: Nombre
           name: Categoría
+        newsletter:
+          fields:
+            created_at: Fecha de creación
+            progress: Progreso
+            sent_at: Enviado el
+            subject: Asunto
+          name: Boletín
         participatory_process:
           fields:
             created_at: Fecha de creación
@@ -209,6 +239,35 @@ es:
             name: Nombre
             phone: Teléfono
             users_count: Número de usuarios
+      newsletters:
+        create:
+          error: Se ha producido un error al crear este boletín.
+          success: Boletín creado con éxito. Por favor, revíselo antes de enviarlo.
+        deliver:
+          error: Ha habido un error de entrega de este boletín.
+          success: Boletín enviado con éxito.
+        destroy:
+          error_already_sent: 'No se puede destruir el boletín de noticias: Ya se ha enviado.'
+          success: Boletín destruido con éxito.
+        edit:
+          save_and_preview: Guardar y vista previa
+          title: Editar boletín
+        form:
+          interpolations_hint: 'Sugerencia: Puede utilizar "%{name}" en cualquier parte del cuerpo o asunto y será reemplazado por el nombre del destinatario.'
+        index:
+          confirm_delete: '¿Estás seguro de que quieres eliminar este boletín?'
+          title: Boletines
+        new:
+          save: Guardar
+          title: Nuevo boletín
+        show:
+          confirm_deliver: '¿Estás seguro de que quieres enviar este boletín? Esta acción no se puede deshacer.'
+          deliver: Enviar boletín
+          preview: Previsualizar
+          subject: Asunto
+        update:
+          error: Se ha producido un error al actualizar este boletín.
+          success: Boletín actualizado correctamente. Por favor revísalo antes de enviarlo.
       organization:
         edit:
           title: Editar organización

data/config/locales/eu.yml

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

data/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
@@ -38,6 +45,13 @@ Decidim::Admin::Engine.routes.draw do
       end
     end
 
+    resources :newsletters do
+      member do
+        get :preview
+        post :deliver
+      end
+    end
+
     resources :user_groups, only: [:index] do
       member do
         put :verify

data/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/lib/decidim/admin/engine.rb

@@ -33,6 +33,7 @@ module Decidim
         Decidim.configure do |config|
           config.abilities += ["Decidim::Admin::Abilities::AdminUser"]
           config.abilities += ["Decidim::Admin::Abilities::ParticipatoryProcessAdmin"]
+          config.abilities += ["Decidim::Admin::Abilities::CollaboratorUser"]
         end
       end
     end

data/lib/decidim/admin/features/base_controller.rb

@@ -16,10 +16,14 @@ module Decidim
 
         delegate :active_step, to: :current_participatory_process, prefix: false
 
-        before_action do
+        before_action except: [:index, :show] do
           authorize! :manage, current_feature
         end
 
+        before_action on: [:index, :show] do
+          authorize! :read, current_feature
+        end
+
         def current_feature
           request.env["decidim.current_feature"]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -172,34 +172,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0.rc
-- !ruby/object:Gem::Dependency
-  name: cancancan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -216,6 +202,7 @@ files:
 - app/assets/javascripts/decidim/admin/sort_steps.js.es6
 - app/assets/javascripts/decidim/admin/tab_focus.js.es6
 - app/assets/stylesheets/decidim/admin/_actions.scss
+- app/assets/stylesheets/decidim/admin/_email_preview.scss
 - app/assets/stylesheets/decidim/admin/_forms.scss
 - app/assets/stylesheets/decidim/admin/_foundation_and_overrides.scss
 - app/assets/stylesheets/decidim/admin/_icons.scss
@@ -229,12 +216,14 @@ files:
 - app/commands/decidim/admin/create_attachment.rb
 - app/commands/decidim/admin/create_category.rb
 - app/commands/decidim/admin/create_feature.rb
+- app/commands/decidim/admin/create_newsletter.rb
 - app/commands/decidim/admin/create_participatory_process.rb
 - app/commands/decidim/admin/create_participatory_process_admin.rb
 - app/commands/decidim/admin/create_participatory_process_step.rb
 - app/commands/decidim/admin/create_scope.rb
 - app/commands/decidim/admin/create_static_page.rb
 - app/commands/decidim/admin/deactivate_participatory_process_step.rb
+- app/commands/decidim/admin/deliver_newsletter.rb
 - app/commands/decidim/admin/destroy_category.rb
 - app/commands/decidim/admin/destroy_feature.rb
 - app/commands/decidim/admin/destroy_participatory_process_step.rb
@@ -244,6 +233,8 @@ files:
 - app/commands/decidim/admin/update_attachment.rb
 - app/commands/decidim/admin/update_category.rb
 - app/commands/decidim/admin/update_feature.rb
+- app/commands/decidim/admin/update_feature_permissions.rb
+- app/commands/decidim/admin/update_newsletter.rb
 - app/commands/decidim/admin/update_organization.rb
 - app/commands/decidim/admin/update_participatory_process.rb
 - app/commands/decidim/admin/update_participatory_process_step.rb
@@ -255,7 +246,9 @@ files:
 - app/controllers/decidim/admin/concerns/has_attachments.rb
 - app/controllers/decidim/admin/concerns/participatory_process_admin.rb
 - app/controllers/decidim/admin/dashboard_controller.rb
+- app/controllers/decidim/admin/feature_permissions_controller.rb
 - app/controllers/decidim/admin/features_controller.rb
+- app/controllers/decidim/admin/newsletters_controller.rb
 - app/controllers/decidim/admin/organization_controller.rb
 - app/controllers/decidim/admin/participatory_process_attachments_controller.rb
 - app/controllers/decidim/admin/participatory_process_publications_controller.rb
@@ -271,19 +264,25 @@ files:
 - app/forms/decidim/admin/attachment_form.rb
 - app/forms/decidim/admin/category_form.rb
 - app/forms/decidim/admin/feature_form.rb
+- app/forms/decidim/admin/newsletter_form.rb
 - app/forms/decidim/admin/organization_form.rb
 - app/forms/decidim/admin/participatory_process_form.rb
 - app/forms/decidim/admin/participatory_process_step_form.rb
 - app/forms/decidim/admin/participatory_process_user_role_form.rb
+- app/forms/decidim/admin/permission_form.rb
+- app/forms/decidim/admin/permissions_form.rb
 - app/forms/decidim/admin/scope_form.rb
 - app/forms/decidim/admin/static_page_form.rb
 - app/helpers/decidim/admin/application_helper.rb
 - app/helpers/decidim/admin/attributes_display_helper.rb
 - app/helpers/decidim/admin/feature_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
 - app/mailers/decidim/admin/application_mailer.rb
 - app/models/decidim/admin/abilities/admin_user.rb
 - app/models/decidim/admin/abilities/base.rb
+- app/models/decidim/admin/abilities/collaborator_user.rb
 - app/models/decidim/admin/abilities/participatory_process_admin.rb
 - app/models/decidim/admin/application_record.rb
 - app/models/decidim/admin/participatory_process_user_role.rb
@@ -302,12 +301,18 @@ files:
 - app/views/decidim/admin/dashboard/show.html.erb
 - app/views/decidim/admin/devise/mailers/password_change.html.erb
 - app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+- app/views/decidim/admin/feature_permissions/edit.html.erb
 - app/views/decidim/admin/features/_feature.html.erb
 - app/views/decidim/admin/features/_form.html.erb
 - app/views/decidim/admin/features/_settings_fields.html.erb
 - app/views/decidim/admin/features/edit.html.erb
 - app/views/decidim/admin/features/index.html.erb
 - app/views/decidim/admin/features/new.html.erb
+- app/views/decidim/admin/newsletters/_form.html.erb
+- app/views/decidim/admin/newsletters/edit.html.erb
+- app/views/decidim/admin/newsletters/index.html.erb
+- app/views/decidim/admin/newsletters/new.html.erb
+- app/views/decidim/admin/newsletters/show.html.erb
 - app/views/decidim/admin/organization/_form.html.erb
 - app/views/decidim/admin/organization/edit.html.erb
 - app/views/decidim/admin/participatory_process_steps/_form.html.erb
@@ -345,6 +350,7 @@ files:
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/eu.yml
 - config/routes.rb
 - db/migrate/20161102144648_add_admin_participatory_process_user_roles.rb
 - db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb