decidim 0.0.2 → 0.0.3

data/decidim-admin/app/assets/javascripts/decidim/admin/tab_focus.js.es6

@@ -3,7 +3,7 @@
 /**
  * When switching tabs in i18n fields, autofocus on the input to save clicks #212
  */
-$(document).on('turbolinks:load', () => {
+$(() => {
   // Event launched by foundation
   $('[data-tabs]').on('change.zf.tabs', (event) => {
     const $container = $(event.target).next('.tabs-content .tabs-panel.is-active');

data/decidim-admin/app/assets/stylesheets/decidim/admin/_foundation_and_overrides.scss

@@ -27,7 +27,7 @@
 @include foundation-drilldown-menu;
 @include foundation-dropdown;
 @include foundation-dropdown-menu;
-@include foundation-flex-video;
+@include foundation-responsive-embed;
 @include foundation-label;
 @include foundation-media-object;
 @include foundation-menu;

data/decidim-admin/app/commands/decidim/admin/{create_participatory_process_attachment.rb → create_attachment.rb}

@@ -3,15 +3,14 @@ module Decidim
   module Admin
     # A command with all the business logic to add an attachment to a
     # participatory process.
-    class CreateParticipatoryProcessAttachment < Rectify::Command
+    class CreateAttachment < Rectify::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
-      # participatory_process - The ParticipatoryProcess that will hold the
-      #   attachment
-      def initialize(form, participatory_process)
+      # attached_to - The ActiveRecord::Base that will hold the attachment
+      def initialize(form, attached_to)
         @form = form
-        @participatory_process = participatory_process
+        @attached_to = attached_to
       end
 
       # Executes the command. Broadcasts these events:
@@ -32,11 +31,11 @@ module Decidim
       attr_reader :form
 
       def create_attachment
-        ParticipatoryProcessAttachment.create!(
+        Attachment.create!(
           title: form.title,
           description: form.description,
           file: form.file,
-          participatory_process: @participatory_process
+          attached_to: @attached_to
         )
       end
     end

data/decidim-admin/app/commands/decidim/admin/create_participatory_process.rb

@@ -19,9 +19,15 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if form.invalid?
-
         process = create_participatory_process
-        broadcast(:ok, process)
+
+        if process.persisted?
+          broadcast(:ok, process)
+        else
+          form.errors.add(:hero_image, process.errors[:hero_image]) if process.errors.include? :hero_image
+          form.errors.add(:banner_image, process.errors[:banner_image]) if process.errors.include? :banner_image
+          broadcast(:invalid)
+        end
       end
 
       private
@@ -30,7 +36,7 @@ module Decidim
 
       def create_participatory_process
         transaction do
-          process = ParticipatoryProcess.create!(
+          process = ParticipatoryProcess.new(
             title: form.title,
             subtitle: form.subtitle,
             slug: form.slug,
@@ -43,6 +49,9 @@ module Decidim
             organization: form.current_organization
           )
 
+          return process unless process.valid?
+          process.save!
+
           process.steps.create!(
             title: TranslationsHelper.multi_translation(
               "decidim.admin.participatory_process_steps.default_title",

data/decidim-admin/app/commands/decidim/admin/{update_participatory_process_attachment.rb → update_attachment.rb}

@@ -3,14 +3,15 @@ module Decidim
   module Admin
     # A command with all the business logic to update an attachment from a
     # participatory process.
-    class UpdateParticipatoryProcessAttachment < Rectify::Command
-      attr_reader :participatory_process_attachment
+    class UpdateAttachment < Rectify::Command
+      attr_reader :attachment
+
       # Public: Initializes the command.
       #
-      # participatory_process_attachment - the ParticipatoryProcessAttachment to update
+      # attachment - the Attachment to update
       # form - A form object with the params.
-      def initialize(participatory_process_attachment, form)
-        @participatory_process_attachment = participatory_process_attachment
+      def initialize(attachment, form)
+        @attachment = attachment
         @form = form
       end
 
@@ -32,7 +33,7 @@ module Decidim
       attr_reader :form
 
       def update_attachment
-        participatory_process_attachment.update_attributes!(attributes)
+        attachment.update_attributes!(attributes)
       end
 
       def attributes

data/decidim-admin/app/commands/decidim/admin/update_feature.rb

@@ -35,7 +35,8 @@ module Decidim
         @feature.update_attributes(
           name: form.name,
           settings: form.settings,
-          step_settings: form.step_settings
+          step_settings: form.step_settings,
+          weight: form.weight
         )
       end
 

data/decidim-admin/app/commands/decidim/admin/update_organization.rb

@@ -42,6 +42,7 @@ module Decidim
           welcome_text: form.welcome_text,
           homepage_image: form.homepage_image || organization.homepage_image,
           logo: form.logo || organization.logo,
+          favicon: form.favicon || organization.favicon,
           default_locale: form.default_locale,
           show_statistics: form.show_statistics
         }

data/decidim-admin/app/commands/decidim/admin/update_participatory_process.rb

@@ -21,17 +21,25 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) if form.invalid?
-
         update_participatory_process
-        broadcast(:ok)
+
+        if @participatory_process.valid?
+          broadcast(:ok, @participatory_process)
+        else
+          form.errors.add(:hero_image, @participatory_process.errors[:hero_image]) if @participatory_process.errors.include? :hero_image
+          form.errors.add(:banner_image, @participatory_process.errors[:banner_image]) if @participatory_process.errors.include? :banner_image
+          broadcast(:invalid)
+        end
       end
 
+
       private
 
       attr_reader :form
 
       def update_participatory_process
-        @participatory_process.update_attributes!(attributes)
+        @participatory_process.assign_attributes(attributes)
+        @participatory_process.save! if @participatory_process.valid?
       end
 
       def attributes
@@ -44,7 +52,11 @@ module Decidim
           banner_image: form.banner_image,
           promoted: form.promoted,
           description: form.description,
-          short_description: form.short_description
+          short_description: form.short_description,
+          domain: form.domain,
+          scope: form.scope,
+          developer_group: form.developer_group,
+          end_date: form.end_date
         }.compact
       end
     end

data/decidim-admin/app/constraints/decidim/admin/organization_dashboard_constraint.rb

@@ -33,7 +33,7 @@ module Decidim
       end
 
       def ability
-        Decidim::Admin::Abilities::Base.new(user)
+        Decidim::Admin::Abilities::Base.new(user, current_organization: organization)
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/application_controller.rb

@@ -16,8 +16,8 @@ module Decidim
 
       # Overwrites `cancancan`'s method to point to the correct ability class,
       # since the gem expects the ability class to be in the root namespace.
-      def current_ability
-        @current_ability ||= Decidim::Admin::Abilities::Base.new(current_user)
+      def current_ability_klass
+        Decidim::Admin::Abilities::Base
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/concerns/has_attachments.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    module Concerns
+      # Attachments can be related to any class in Decidim, in order to
+      # manage the attachments for a given type, you should create a new
+      # controller and include this concern.
+      #
+      # The only requirement is to define a `attached_to` method that
+      # returns an instance of the model to attach the attachment to.
+      module HasAttachments
+        extend ActiveSupport::Concern
+
+        included do
+          helper_method :attached_to, :authorization_object
+
+          def index
+            authorize! :read, authorization_object
+
+            render template: "decidim/admin/attachments/index"
+          end
+
+          def new
+            authorize! :create, authorization_object
+            @form = form(AttachmentForm).instance
+            render template: "decidim/admin/attachments/new"
+          end
+
+          def create
+            authorize! :create, authorization_object
+            @form = form(AttachmentForm).from_params(params)
+
+            CreateAttachment.call(@form, attached_to) do
+              on(:ok) do
+                flash[:notice] = I18n.t("attachments.create.success", scope: "decidim.admin")
+                redirect_to action: :index
+              end
+
+              on(:invalid) do
+                flash.now[:alert] = I18n.t("attachments.create.error", scope: "decidim.admin")
+                render template: "decidim/admin/attachments/new"
+              end
+            end
+          end
+
+          def edit
+            @attachment = collection.find(params[:id])
+            authorize! :update, authorization_object
+            @form = form(AttachmentForm).from_model(@attachment)
+            render template: "decidim/admin/attachments/edit"
+          end
+
+          def update
+            @attachment = collection.find(params[:id])
+            authorize! :update, authorization_object
+            @form = form(AttachmentForm).from_params(params)
+
+            UpdateAttachment.call(@attachment, @form) do
+              on(:ok) do
+                flash[:notice] = I18n.t("attachments.update.success", scope: "decidim.admin")
+                redirect_to action: :index
+              end
+
+              on(:invalid) do
+                flash.now[:alert] = I18n.t("attachments.update.error", scope: "decidim.admin")
+                render template: "decidim/admin/attachments/edit"
+              end
+            end
+          end
+
+          def show
+            @attachment = collection.find(params[:id])
+            authorize! :read, authorization_object
+            render template: "decidim/admin/attachments/show"
+          end
+
+          def destroy
+            @attachment = collection.find(params[:id])
+            authorize! :destroy, authorization_object
+            @attachment.destroy!
+
+            flash[:notice] = I18n.t("attachments.destroy.success", scope: "decidim.admin")
+
+            redirect_to after_destroy_path
+          end
+
+          # Public: Returns a String or Object that will be passed to `redirect_to` after
+          # destroying an attachment. By default it redirects to the attached_to.
+          #
+          # It can be redefined at controller level if you need to redirect elsewhere.
+          def after_destroy_path
+            attached_to
+          end
+
+          # Public: The only method to be implemented at the controller. You need to
+          # return the object where the attachment will be attached to.
+          def attached_to
+            raise NotImplementedError
+          end
+
+          # Public: The Class or Object to be used with the authorization layer to
+          # verify the user can manage the attachments
+          #
+          # By default is the same as the attached_to.
+          def authorization_object
+            attached_to
+          end
+
+          def collection
+            @collection ||= attached_to.attachments
+          end
+        end
+      end
+    end
+  end
+end

data/decidim-admin/app/controllers/decidim/admin/participatory_process_attachments_controller.rb

@@ -8,76 +8,14 @@ module Decidim
     #
     class ParticipatoryProcessAttachmentsController < ApplicationController
       include Concerns::ParticipatoryProcessAdmin
+      include Concerns::HasAttachments
 
-      def index
-        authorize! :read, ParticipatoryProcessAttachment
+      def attached_to
+        participatory_process
       end
 
-      def new
-        authorize! :create, ParticipatoryProcessAttachment
-        @form = form(ParticipatoryProcessAttachmentForm).instance
-      end
-
-      def create
-        authorize! :create, ParticipatoryProcessAttachment
-        @form = form(ParticipatoryProcessAttachmentForm).from_params(params)
-
-        CreateParticipatoryProcessAttachment.call(@form, participatory_process) do
-          on(:ok) do
-            flash[:notice] = I18n.t("participatory_process_attachments.create.success", scope: "decidim.admin")
-            redirect_to participatory_process_attachments_path(participatory_process)
-          end
-
-          on(:invalid) do
-            flash.now[:alert] = I18n.t("participatory_process_attachments.create.error", scope: "decidim.admin")
-            render :new
-          end
-        end
-      end
-
-      def edit
-        @participatory_process_attachment = collection.find(params[:id])
-        authorize! :update, @participatory_process_attachment
-        @form = form(ParticipatoryProcessAttachmentForm).from_model(@participatory_process_attachment)
-      end
-
-      def update
-        @participatory_process_attachment = collection.find(params[:id])
-        authorize! :update, @participatory_process_attachment
-        @form = form(ParticipatoryProcessAttachmentForm).from_params(params)
-
-        UpdateParticipatoryProcessAttachment.call(@participatory_process_attachment, @form) do
-          on(:ok) do
-            flash[:notice] = I18n.t("participatory_process_attachments.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_attachments_path(participatory_process)
-          end
-
-          on(:invalid) do
-            flash.now[:alert] = I18n.t("participatory_process_attachments.update.error", scope: "decidim.admin")
-            render :edit
-          end
-        end
-      end
-
-      def show
-        @participatory_process_attachment = collection.find(params[:id])
-        authorize! :read, @participatory_process_attachment
-      end
-
-      def destroy
-        @participatory_process_attachment = collection.find(params[:id])
-        authorize! :destroy, @participatory_process_attachment
-        @participatory_process_attachment.destroy!
-
-        flash[:notice] = I18n.t("participatory_process_attachments.destroy.success", scope: "decidim.admin")
-
-        redirect_to participatory_process_attachments_path(@participatory_process_attachment.participatory_process)
-      end
-
-      private
-
-      def collection
-        @collection ||= participatory_process.attachments
+      def authorization_object
+        @attachment || Attachment
       end
     end
   end

data/decidim-admin/app/controllers/decidim/admin/users_controller.rb

@@ -7,17 +7,17 @@ module Decidim
     #
     class UsersController < Admin::ApplicationController
       def index
-        authorize! :index, User
+        authorize! :index, :admin_users
         @users = collection
       end
 
       def new
-        authorize! :new, User
+        authorize! :new, :admin_users
         @form = form(InviteAdminForm).instance
       end
 
       def create
-        authorize! :new, User
+        authorize! :new, :admin_users
 
         default_params = {
           organization: current_organization,
@@ -42,7 +42,7 @@ module Decidim
       end
 
       def resend_invitation
-        authorize! :invite, user
+        authorize! :invite, :admin_users
 
         InviteUserAgain.call(user, "invite_admin") do
           on(:ok) do
@@ -58,7 +58,7 @@ module Decidim
       end
 
       def destroy
-        authorize! :destroy, user
+        authorize! :destroy, :admin_users
 
         RemoveUserRole.call(user, "admin") do
           on(:ok) do

data/decidim-admin/app/forms/decidim/admin/{participatory_process_attachment_form.rb → attachment_form.rb}

@@ -3,14 +3,14 @@ module Decidim
   module Admin
     # A form object used to create attachments in a participatory process.
     #
-    class ParticipatoryProcessAttachmentForm < Form
+    class AttachmentForm < Form
       include TranslatableAttributes
 
       attribute :file
       translatable_attribute :title, String
       translatable_attribute :description, String
 
-      mimic :participatory_process_attachment
+      mimic :attachment
 
       validates :file, presence: true, unless: :persisted?
       validates :title, :description, translatable_presence: true