decidim 0.0.5 → 0.0.6

data/decidim-admin/app/models/decidim/admin/abilities/admin_user.rb

@@ -11,6 +11,7 @@ module Decidim
           return unless user && user.role?(:admin)
 
           can :manage, ParticipatoryProcess
+          can :manage, ParticipatoryProcessGroup
           can :manage, ParticipatoryProcessStep
           can :manage, Category
           can :manage, ParticipatoryProcessUserRole
@@ -27,6 +28,7 @@ module Decidim
           can :manage, Feature
           can :read, :admin_dashboard
           can :manage, :admin_users
+          can :manage, Moderation
           can :manage, Attachment
           can :manage, Scope
           can :manage, Newsletter

data/decidim-admin/app/models/decidim/admin/abilities/participatory_process_admin.rb

@@ -33,6 +33,10 @@ module Decidim
             role.user != user
           end
 
+          can :manage, Moderation do |moderation|
+            participatory_processes.include?(moderation.participatory_process)
+          end
+
           can :manage, Attachment do |attachment|
             participatory_processes.include?(attachment.attached_to)
           end

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

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

data/decidim-admin/app/queries/decidim/admin/process_admins.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A class used to find the admins for a participatory process including
+    # organization admins.
+    class ProcessAdmins < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # process - a process that needs to find its process admins
+      def self.for(process)
+        new(process).query
+      end
+
+      # Initializes the class.
+      #
+      # process - a process that needs to find its process admins
+      def initialize(process)
+        @process = process
+      end
+
+      # Finds organization admins and the users with role admin for the given process.
+      #
+      # Returns an ActiveRecord::Relation.
+      def query
+        Decidim::User.where(id: organization_admins).or(Decidim::User.where(id: process_admins))
+      end
+
+      private
+
+      attr_reader :process
+
+      def organization_admins
+        process.organization.admins
+      end
+
+      def process_admins
+        Decidim::Admin::ParticipatoryProcessUserRole
+          .where(participatory_process: process, role: :admin)
+          .pluck(:decidim_user_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+<h2><%= t(".title") %></h2>
+
+<div class="actions title">
+  <%= link_to t("actions.not_hidden", scope: "decidim.moderations"), decidim_admin.participatory_process_moderations_path %>
+  |
+  <%= link_to t("actions.hidden", scope: "decidim.moderations"), decidim_admin.participatory_process_moderations_path(hidden: true) %>
+</div>
+
+<table class="stack">
+  <thead>
+    <tr>
+      <th><%= t("models.moderation.fields.reportable", scope: "decidim.moderations") %></th>
+      <th><%= t("models.moderation.fields.reported_content", scope: "decidim.moderations") %></th>
+      <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
+      <th><%= t("models.moderation.fields.report_count", scope: "decidim.moderations") %></th>
+      <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
+      <th class="actions"><%= t("actions.title", scope: "decidim.moderations") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% moderations.each do |moderation| %>
+      <tr data-id="<%= moderation.id %>">
+        <td>
+          <%= moderation.reportable.class.name %>
+        </td>
+        <td>
+          <%= moderation.reportable.reported_content %>
+        </td>
+        <td>
+          <ul>
+            <% moderation.reports.each do |report| %>
+              <li>
+                <% if report.details.blank? %>
+                  <%= report.reason %>
+                <% else %>
+                  <span
+                    data-tooltip
+                    aria-haspopup="true"
+                    class="has-tip"
+                    title="<%= report.details %>">
+                      <%= report.reason %>
+                  </span>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        </td>
+        <td>
+          <%= moderation.report_count %>
+        </td>
+        <td>
+          <%= l moderation.hidden_at if moderation.hidden_at.present? %>
+        </td>
+        <td class="actions">
+          <% if can? :unreport, moderation %>
+            <%= link_to t("actions.unreport", scope: "decidim.moderations"), decidim_admin.unreport_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+          <% end %>
+          <% if !moderation.reportable.hidden? && can?(:hide, moderation) %>
+            | <%= link_to t("actions.hide", scope: "decidim.moderations"), decidim_admin.hide_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -2,6 +2,10 @@
   <%= form.text_field :name %>
 </div>
 
+<div class="field">
+  <%= form.text_field :reference_prefix %>
+</div>
+
 <div class="field">
   <%= form.text_field :twitter_handler %>
 </div>

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

@@ -0,0 +1,17 @@
+<div class="field">
+  <%= form.translated :text_field, :name, autofocus: true %>
+</div>
+
+<div class="field">
+  <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
+</div>
+
+<div class="field">
+  <% if processes_for_select %>
+    <%= form.select :participatory_process_ids, processes_for_select, {}, { multiple: true, class: "chosen-select" } %>
+  <% end %>
+</div>
+
+<div class="field">
+  <%= form.file_field :hero_image %>
+</div>

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

@@ -0,0 +1,13 @@
+<div class="actions">
+  <% if can? :destroy, participatory_process_group %>
+    <%= link_to t("decidim.admin.actions.destroy"), participatory_process_group, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
+  <% end %>
+</div>
+
+<%= decidim_form_for(@form) do |f| %>
+  <%= render partial: 'form', object: f %>
+
+  <div class="actions">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,38 @@
+<% provide :title do %>
+  <h2><%= t "decidim.admin.titles.participatory_process_groups" %></h2>
+<% end %>
+
+<div class="actions title">
+  <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), ['new', 'participatory_process_group'], class: 'new' if can? :create, Decidim::ParticipatoryProcessGroup %>
+</div>
+
+<table class="stack">
+  <thead>
+    <tr>
+      <th><%= t("models.participatory_process_group.fields.name", scope: "decidim.admin") %></th>
+      <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% collection.each do |group| %>
+      <tr>
+        <td>
+          <%= link_to translated_attribute(group.name), group %><br />
+        </td>
+        <td class="actions">
+          <% if can? :preview, group %>
+            <%= link_to t("actions.preview", scope: "decidim.admin"), decidim.participatory_process_group_path(group) %>
+          <% end %>
+
+          <% if can? :update, group %>
+            <%= link_to t("actions.edit", scope: "decidim.admin"), ['edit', group], class: "small button secondary" %>
+          <% end %>
+
+          <% if can? :destroy, group %>
+            <%= link_to t("actions.destroy", scope: "decidim.admin"), group, method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

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

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

@@ -0,0 +1,23 @@
+<dl>
+  <%= display_for participatory_process_group,
+    :name,
+    :description
+  %>
+ 
+  <dt><%= display_label(participatory_process_group, :participatory_processes) %></dt>
+  <% if participatory_process_group.participatory_processes.any? %>
+    <dd>
+      <ul>
+        <% participatory_process_group.participatory_processes.each do |participatory_process| %>
+          <li><%= translated_attribute participatory_process.title %></li>
+        <% end %>
+      </ul>
+    </dd>
+  <% end %>
+  <dt><%= display_label(participatory_process_group, :hero_image) %></dt>
+  <dd>
+    <% if participatory_process_group.hero_image? %>
+      <%= image_tag participatory_process_group.hero_image.url.to_s %>
+    <% end %>
+  </dd>
+</dl>

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

@@ -2,10 +2,6 @@
   <%= form.translated :text_field, :title, autofocus: true %>
 </div>
 
-<div class="field">
-  <%= form.translated :editor, :short_description %>
-</div>
-
 <div class="field">
   <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
 </div>

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

@@ -2,18 +2,17 @@
 
 <div class="actions">
   <hr />
-  <%= link_to t("decidim.admin.actions.edit"), ['edit', @participatory_process_step] if can? :update, @participatory_process_step %>
-  <%= link_to t("decidim.admin.actions.destroy"), @participatory_process_step, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if can? :destroy, @participatory_process_step %>
+  <%= link_to t("decidim.admin.actions.edit"), edit_participatory_process_step_path(participatory_process, @participatory_process_step) if can? :update, @participatory_process_step %>
+  <%= link_to t("decidim.admin.actions.destroy"), participatory_process_step_path(participatory_process, @participatory_process_step), method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if can? :destroy, @participatory_process_step %>
 </div>
 
 <dl>
   <%= display_for @participatory_process_step,
     :title,
-    :short_description,
     :description
     %>
   <dt><%= display_label(@participatory_process_step, :start_date) %></dt>
-  <dd><%= l @participatory_process_step.start_date, format: :short %></dd>
+  <dd><%= l @participatory_process_step.start_date, format: :short if @participatory_process_step.start_date.present? %></dd>
   <dt><%= display_label(@participatory_process_step, :end_date) %></dt>
-  <dd><%= l @participatory_process_step.end_date, format: :short %></dd>
+  <dd><%= l @participatory_process_step.end_date, format: :short if @participatory_process_step.end_date.present? %></dd>
 </dl>

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

@@ -1,34 +1,37 @@
 <section id="process_admins">
   <h3><%= t(".process_admins_title", scope: "decidim.admin") %></h3>
-
-  <%= decidim_form_for :participatory_process_user_role, url: participatory_process_user_roles_path(participatory_process) do |f| %>
-    <table class="stack">
-      <thead>
-        <tr>
-          <th><%= t("models.participatory_process_user_role.fields.email", scope: "decidim.admin") %></th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% process_admin_roles.each do |role| %>
-          <tr>
-            <td>
-              <%= role.user.email %><br />
-            </td>
-            <td class="actions">
-              <%= link_to t("actions.destroy", scope: "decidim.admin"), participatory_process_user_role_path(participatory_process, role), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, role %>
-            </td>
-          </tr>
-        <% end %>
+  <table class="stack">
+    <thead>
+      <tr>
+        <th><%= t("models.participatory_process_user_role.fields.email", scope: "decidim.admin") %></th>
+        <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% process_admin_roles.each do |role| %>
         <tr>
           <td>
-            <%= f.email_field :email, label: false %>
+            <%= role.user.email %><br />
           </td>
           <td class="actions">
-            <%= f.submit t("actions.create", scope: "decidim.admin") %>
+            <%= link_to t("actions.destroy", scope: "decidim.admin"), participatory_process_user_role_path(participatory_process, role), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, role %>
           </td>
         </tr>
-      </tbody>
-    </table>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= decidim_form_for :participatory_process_user_role, url: participatory_process_user_roles_path(participatory_process) do |form| %>
+    <div class="field">
+      <%= form.text_field :name %>
+    </div>
+    <div class="field">
+      <%= form.email_field :email %>
+    </div>
+    <div class="field">
+      <%= form.label :roles %>
+      <%= select :participatory_process_user_role, :role, Decidim::Admin::ParticipatoryProcessUserRole::ROLES, include_blank: false %>
+    </div>
+    <%= form.submit t("actions.create", scope: "decidim.admin") %>
   <% end %>
 </section>

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

@@ -39,7 +39,7 @@
 </div>
 
 <div class="field">
-  <%= form.translated :text_field, :scope %>
+  <%= form.translated :text_field, :meta_scope %>
 </div>
 
 <div class="field">
@@ -62,3 +62,12 @@
   <%= form.translated :text_field, :participatory_structure %>
 </div>
 
+<div class="field">
+  <%= form.collection_select :scope_id, organization_scopes, :id, :name %>
+</div>
+
+<div class="field">
+  <% if process_groups_for_select %>
+    <%= form.select :participatory_process_group_id, process_groups_for_select, prompt: I18n.t("decidim.participatory_processes.participatory_process_groups.none") %>
+  <% end %>
+</div>

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

@@ -6,7 +6,7 @@
     :slug,
     :short_description,
     :description,
-    :scope,
+    :meta_scope,
     :developer_group,
     :local_area,
     :target,
@@ -37,4 +37,18 @@
 
   <dt><%= display_label(participatory_process, :promoted) %></dt>
   <dd><%= humanize_boolean participatory_process.promoted? %></dd>
+
+  <dt><%= display_label(participatory_process, :scope) %></dt>
+  <% if participatory_process.scope %>
+    <dd><%= participatory_process.scope.name %></dd>
+  <% else %>
+    <dd><%= t("decidim.participatory_processes.scopes.global") %></dd>
+  <% end %>
+
+  <dt><%= display_label(participatory_process, :participatory_process_group) %></dt>
+  <% if participatory_process.participatory_process_group %>
+    <dd><%= translated_attribute participatory_process.participatory_process_group.name %></dd>
+  <% else %>
+    <dd><%= t("decidim.participatory_processes.participatory_process_groups.none") %></dd>
+  <% end %>
 </dl>

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

@@ -2,3 +2,4 @@
 <%= csrf_meta_tags %>
 <%= stylesheet_link_tag    'decidim/admin/application', media: 'all' %>
 <%= javascript_include_tag 'decidim/admin/application' %>
+

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

@@ -0,0 +1,14 @@
+<div class="session-box">
+  <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+    <li class="is-dropdown-submenu-parent">
+      <%= link_to t("name", scope: "locale") %>
+      <% if available_locales.length > 1 %>
+        <ul class="menu is-dropdown-submenu">
+          <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
+            <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
+          <% end %>
+        </ul>
+      <% end %>
+    </li>
+  </ul>
+</div>