decidim 0.0.3 → 0.0.4

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

@@ -7,6 +7,9 @@ module Decidim
       include NeedsAuthorization
       include FormFactory
       include LocaleSwitcher
+      helper Decidim::DecidimFormHelper
+
+      helper Decidim::LanguageChooserHelper
 
       protect_from_forgery with: :exception, prepend: true
 

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+require_dependency "decidim/admin/application_controller"
+
+module Decidim
+  module Admin
+    # Controller that allows managing all the Admins.
+    #
+    class FeaturePermissionsController < ApplicationController
+      include Concerns::ParticipatoryProcessAdmin
+      helper_method :authorizations, :feature
+
+      def edit
+        authorize! :update, feature
+        @permissions_form = PermissionsForm.new(
+          permissions: permission_forms
+        )
+      end
+
+      def update
+        authorize! :update, feature
+        @permissions_form = PermissionsForm.from_params(params)
+
+        UpdateFeaturePermissions.call(@permissions_form, feature) do
+          on(:ok) do
+            flash[:notice] = t("feature_permissions.update.success", scope: "decidim.admin")
+            redirect_to participatory_process_features_path(participatory_process)
+          end
+
+          on(:invalid) do
+            render action: :edit
+          end
+        end
+      end
+
+      private
+
+      def permission_forms
+        permissions = feature.permissions || {}
+
+        @permission_forms ||= feature.manifest.actions.inject({}) do |result, action|
+          form = PermissionForm.new(
+            authorization_handler_name: permissions.dig(action, "authorization_handler_name"),
+            options: permissions.dig(action, "options").try(:to_json)
+          )
+
+          result.update(action => form)
+        end
+      end
+
+      def authorizations
+        Decidim.authorization_handlers.map(&:handler_name)
+      end
+
+      def feature
+        @feature ||= participatory_process.features.find(params[:feature_id])
+      end
+    end
+  end
+end

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

@@ -88,6 +88,26 @@ module Decidim
         end
       end
 
+      def publish
+        @feature = query_scope.find(params[:id])
+        authorize! :update, @feature
+
+        @feature.update_attribute(:published_at, Time.current)
+
+        flash[:notice] = I18n.t("features.publish.success", scope: "decidim.admin")
+        redirect_to :back
+      end
+
+      def unpublish
+        @feature = query_scope.find(params[:id])
+        authorize! :update, @feature
+
+        @feature.update_attribute(:published_at, nil)
+
+        flash[:notice] = I18n.t("features.unpublish.success", scope: "decidim.admin")
+        redirect_to :back
+      end
+
       private
 
       def query_scope

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

@@ -23,7 +23,9 @@ module Decidim
           organization: current_organization,
           invitation_instructions: "invite_admin",
           roles: %w(admin),
-          invited_by: current_user
+          invited_by: current_user,
+          comments_notifications: true,
+          replies_notifications: true
         }
 
         @form = form(InviteAdminForm).from_params(params.merge(default_params))

data/decidim-admin/app/forms/decidim/admin/organization_form.rb

@@ -11,10 +11,17 @@ module Decidim
 
       attribute :name, String
       attribute :twitter_handler, String
+      attribute :facebook_handler, String
+      attribute :instagram_handler, String
+      attribute :youtube_handler, String
+      attribute :github_handler, String
       attribute :default_locale, String
       attribute :homepage_image
       attribute :logo
       attribute :favicon
+      attribute :official_url
+      attribute :official_img_header
+      attribute :official_img_footer
       attribute :show_statistics
 
       translatable_attribute :description, String
@@ -24,6 +31,9 @@ module Decidim
       validates :default_locale, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
 
+      validates :official_img_header, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+      validates :official_img_footer, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+
       private
 
       def available_locales

data/decidim-admin/app/forms/decidim/admin/participatory_process_form.rb

@@ -11,13 +11,16 @@ module Decidim
       translatable_attribute :subtitle, String
       translatable_attribute :description, String
       translatable_attribute :short_description, String
-      translatable_attribute :domain, String
       translatable_attribute :scope, String
+      translatable_attribute :developer_group, String
+      translatable_attribute :local_area, String
+      translatable_attribute :target, String
+      translatable_attribute :participatory_scope, String
+      translatable_attribute :participatory_structure, String
 
       mimic :participatory_process
 
       attribute :end_date, Date
-      attribute :developer_group, String
       attribute :slug, String
       attribute :hashtag, String
       attribute :promoted, Boolean
@@ -29,10 +32,10 @@ module Decidim
 
       validate :slug, :slug_uniqueness
 
-      validates :hero_image, file_size: { less_than_or_equal_to: lambda { |_record| Decidim.maximum_attachment_size } }, file_content_type: { allow: ['image/jpeg', 'image/png'] }
-      validates :banner_image, file_size: { less_than_or_equal_to:lambda { |_record| Decidim.maximum_attachment_size } }, file_content_type: { allow: ['image/jpeg', 'image/png'] }
+      validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+      validates :banner_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
 
-       private
+      private
 
       def slug_uniqueness
         return unless current_organization.participatory_processes.where(slug: slug).where.not(id: id).any?

data/decidim-admin/app/forms/decidim/admin/permission_form.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This form handles permissions for a particular action in the admin panel.
+    class PermissionForm < Form
+      attribute :authorization_handler_name, String
+      attribute :options, String
+
+      validate :sanitize
+      validate :options_is_valid_json
+
+      private
+
+      def sanitize
+        self.authorization_handler_name = nil if authorization_handler_name.blank?
+        self.options = nil if authorization_handler_name.blank?
+        self.options = nil if options.blank?
+      end
+
+      def options_is_valid_json
+        return unless options
+
+        result = JSON.parse(options)
+        errors.add(:options, :invalid_json) unless result.is_a?(Hash)
+        result
+      rescue JSON::ParserError
+        errors.add(:options, :invalid_json)
+      end
+    end
+  end
+end

data/decidim-admin/app/forms/decidim/admin/permissions_form.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This form handles a set of forms related to handling permissions
+    # in the admin panel.
+    class PermissionsForm < Form
+      mimic :feature_permissions
+
+      attribute :permissions, Hash[String => PermissionForm]
+
+      def valid?
+        super && permissions.values.all?(&:valid?)
+      end
+    end
+  end
+end

data/decidim-admin/app/helpers/decidim/admin/application_helper.rb

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::TranslationsHelper
       include Decidim::HumanizeBooleansHelper
       include Decidim::AriaSelectedLinkToHelper
+      include Decidim::MetaTagsHelper
 
       def title
         current_organization.name

data/decidim-admin/app/models/decidim/admin/participatory_process_user_role.rb

@@ -8,7 +8,7 @@ module Decidim
       belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: Decidim::ParticipatoryProcess
 
       ROLES = %w(admin).freeze
-      validates :role, inclusion: { in: ROLES }
+      validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :participatory_process] }
     end
   end
 end

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form, url: url_for([@attachment.attached_to, @attachment])) do |f| %>
+<%= decidim_form_for(@form, url: url_for([@attachment.attached_to, @attachment])) do |f| %>
   <%= render partial: 'decidim/admin/attachments/form', object: f %>
 
   <div class="actions">

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form, url: [attached_to, @form]) do |f| %>
+<%= decidim_form_for(@form, url: [attached_to, @form]) do |f| %>
   <%= render partial: 'decidim/admin/attachments/form', object: f %>
 
   <div class="actions">

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form, url: participatory_process_category_path(@category.participatory_process, @category)) do |f| %>
+<%= decidim_form_for(@form, url: participatory_process_category_path(@category.participatory_process, @category)) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form, url: participatory_process_categories_path(participatory_process)) do |f| %>
+<%= decidim_form_for(@form, url: participatory_process_categories_path(participatory_process)) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,3 +1,3 @@
-<% content_for :title do %>
+<% provide :title do %>
   <h2><%= t("decidim.admin.titles.dashboard") %></h2>
 <% end %>

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

@@ -0,0 +1,27 @@
+<section id="features">
+  <div class="row">
+    <div class="columns">
+      <h3><%= t(".title") %></h3>
+    </div>
+  </div>
+
+  <%= form_for @permissions_form, url: url_for(action: :update), method: "put" do |form| %>
+    <%= form.fields_for :permissions, form.object do |form| %>
+      <% form.object.permissions.each do |action, permission| %>
+        <%= form.fields_for(action, permission) do |form| %>
+          <fieldset class="card <%=action %>-permission">
+            <div class="card-divider"><%= t("#{feature.manifest.name}.actions.#{action}", scope: "decidim.features") %></div>
+            <div class="card-section">
+              <%= form.select :authorization_handler_name,
+                authorizations.map { |authorization|
+                  [t("#{authorization}.name", scope: "decidim.authorization_handlers"), authorization]
+                }, include_blank: t(".everyone") %>
+              <%= form.text_field :options %>
+            </div>
+          </fieldset>
+        <% end %>
+      <% end %>
+    <% end %>
+    <%= form.submit t(".submit") %>
+  <% end %>
+</section>

data/decidim-admin/app/views/decidim/admin/features/_feature.html.erb

@@ -16,8 +16,18 @@
       <% end %>
     <% end %>
 
+    <% if can?(:update, feature) %>
+      <% if feature.published? %>
+        <%= link_to t("actions.unpublish", scope: "decidim.admin"), url_for(action: :unpublish, id: feature, controller: "features"), class: "small button", method: :put %>
+      <% else %>
+        <%= link_to t("actions.publish", scope: "decidim.admin"), url_for(action: :publish, id: feature, controller: "features"), class: "small button", method: :put %>
+      <% end %>
+    <% end %>
+
     <%= link_to t("actions.configure", scope: "decidim.admin"), url_for(action: :edit, id: feature, controller: "features"), class: "small button" if can? :update, feature %>
 
+    <%= link_to t("actions.permissions", scope: "decidim.admin"), edit_participatory_process_feature_permissions_path(feature_id: feature), class: "small button" if can? :update, feature %>
+
     <%= link_to t("actions.destroy", scope: "decidim.admin"), url_for(action: :destroy, id: feature, controller: "features"), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, feature %>
   </td>
 </tr>

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title", name: t("#{@feature.manifest.name}.name", scope: "decidim.features") %></h3>
 
-<%= form_for([participatory_process, @form], url: participatory_process_feature_path(participatory_process, @feature), method: "put") do |form| %>
+<%= decidim_form_for([participatory_process, @form], url: participatory_process_feature_path(participatory_process, @feature), method: "put") do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature } %>
 
   <div class="actions">

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title", name: t("#{manifest.name}.name", scope: "decidim.features") %></h3>
 
-<%= form_for([participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post") do |form| %>
+<%= decidim_form_for([participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post") do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature } %>
 
   <div class="actions">

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

@@ -6,6 +6,22 @@
   <%= form.text_field :twitter_handler %>
 </div>
 
+<div class="field">
+  <%= form.text_field :facebook_handler %>
+</div>
+
+<div class="field">
+  <%= form.text_field :instagram_handler %>
+</div>
+
+<div class="field">
+  <%= form.text_field :youtube_handler %>
+</div>
+
+<div class="field">
+  <%= form.text_field :github_handler %>
+</div>
+
 <div class="field">
   <%= form.translated :editor, :description %>
 </div>
@@ -30,6 +46,24 @@
   <%= form.file_field :favicon %>
 </div>
 
+<div class="field">
+  <%= form.text_field :official_url %>
+</div>
+
+<div class="field">
+  <%= form.file_field :official_img_header %>
+  <% if current_organization.official_img_header? %>
+      <%= image_tag current_organization.official_img_header.url.to_s %>
+  <% end %>
+</div>
+
+<div class="field">
+  <%= form.file_field :official_img_footer %>
+  <% if current_organization.official_img_footer? %>
+      <%= image_tag current_organization.official_img_footer.url.to_s %>
+  <% end %>
+</div>
+
 <div class="field">
   <%= form.check_box :show_statistics %>
 </div>

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

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

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form, url: participatory_process_step_path(@participatory_process_step.participatory_process, @participatory_process_step)) do |f| %>
+<%= decidim_form_for(@form, url: participatory_process_step_path(@participatory_process_step.participatory_process, @participatory_process_step)) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= 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_process_user_roles/index.html.erb

@@ -1,7 +1,7 @@
 <section id="process_admins">
   <h3><%= t(".process_admins_title", scope: "decidim.admin") %></h3>
 
-  <%= form_for :participatory_process_user_role, url: participatory_process_user_roles_path(participatory_process) do |f| %>
+  <%= decidim_form_for :participatory_process_user_role, url: participatory_process_user_roles_path(participatory_process) do |f| %>
     <table class="stack">
       <thead>
         <tr>

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

@@ -35,7 +35,7 @@
 </div>
 
 <div class="field">
-  <%= form.translated :text_field, :domain %>
+  <%= form.date_field :end_date %>
 </div>
 
 <div class="field">
@@ -43,9 +43,22 @@
 </div>
 
 <div class="field">
-  <%= form.text_field :developer_group %>
+  <%= form.translated :text_field, :developer_group %>
 </div>
 
 <div class="field">
-  <%= form.date_field :end_date %>
-</div>
+  <%= form.translated :text_field, :local_area %>
+</div>
+
+<div class="field">
+  <%= form.translated :text_field, :target %>
+</div>
+
+<div class="field">
+  <%= form.translated :text_field, :participatory_scope %>
+</div>
+
+<div class="field">
+  <%= form.translated :text_field, :participatory_structure %>
+</div>
+