decidim-accountability 0.10.1 → 0.11.0.pre1

data/app/presenters/decidim/accountability/admin_log/result_presenter.rb

@@ -17,10 +17,10 @@ module Decidim
 
         def action_string
           case action
-          when "create"
-            "decidim.accountability.admin_log.result.create"
-          when "update"
-            "decidim.accountability.admin_log.result.update"
+          when "create", "delete", "update"
+            "decidim.accountability.admin_log.result.#{action}"
+          else
+            super
           end
         end
 
@@ -31,6 +31,7 @@ module Decidim
             description: :i18n,
             title: :i18n,
             decidim_scope_id: :scope,
+            parent_id: "Decidim::Accountability::AdminLog::ValueTypes::ParentPresenter",
             progress: :percentage
           }
         end

data/app/presenters/decidim/accountability/admin_log/value_types/parent_presenter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module AdminLog
+      module ValueTypes
+        # This class presents the given value as a Decidim::Accountability::Result. Check
+        # the `DefaultPresenter` for more info on how value presenters work.
+        class ParentPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          # Public: Presents the value as a Decidim::Accountability::Result. If the result can
+          # be found, it shows its title. Otherwise it shows its ID.
+          #
+          # Returns an HTML-safe String.
+          def present
+            return unless value
+            return h.translated_attribute(result.title) if result
+            I18n.t("not_found", id: value, scope: "decidim.accountability.admin_log.value_types.parent_presenter")
+          end
+
+          private
+
+          def result
+            @result ||= Decidim::Accountability::Result.find_by(id: value)
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/decidim/accountability/result_search.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Accountability
     # This class handles search and filtering of results. Needs a
-    # `current_feature` param with a `Decidim::Feature` in order to
+    # `current_component` param with a `Decidim::Component` in order to
     # find the results.
     class ResultSearch < ResourceSearch
       # Public: Initializes the service.
@@ -11,7 +11,7 @@ module Decidim
       # options - A hash of options to modify the search. These options will be
       #          converted to methods by SearchLight so they can be used on filter
       #          methods. (Default {})
-      #          * feature - A Decidim::Feature to get the results from.
+      #          * component - A Decidim::Component to get the results from.
       #          * organization - A Decidim::Organization object.
       #          * parent_id - The parent ID of the result. The value is forced to false to force
       #                        the filter execution when the value is nil

data/app/services/decidim/accountability/results_calculator.rb

@@ -5,8 +5,8 @@ module Decidim
     # This class handles the calculation of progress for a set of results
     class ResultsCalculator
       # Public: Initializes the service.
-      def initialize(feature, scope_id, category_id)
-        @feature = feature
+      def initialize(component, scope_id, category_id)
+        @component = component
         @scope_id = scope_id
         @category_id = category_id
       end
@@ -19,11 +19,11 @@ module Decidim
 
       private
 
-      attr_reader :feature, :scope_id, :category_id
+      attr_reader :component, :scope_id, :category_id
 
       def results
         @results ||= ResultSearch.new(
-          feature: feature,
+          component: component,
           scope_id: scope_id,
           category_id: category_id,
           deep_search: false

data/app/views/decidim/accountability/admin/results/_form.html.erb

@@ -44,7 +44,7 @@
 
     <div class="row">
       <div class="columns xlarge-6">
-        <%= form.select :decidim_accountability_status_id, statuses.map{|status| [translated_attribute(status.name), status.id, { 'data-progress' => status.progress }] }, include_blank: true %>
+        <%= form.select :decidim_accountability_status_id, statuses.map{|status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
       </div>
 
       <div class="columns xlarge-6">
@@ -54,9 +54,9 @@
 
     <div class="row column">
       <% if @form.proposals %>
-        <% picker_options = { id: "decidim_accountability_proposals", class: "picker-multiple", name: 'result[proposal_ids]', multiple: true }
-        prompt_params= { url: 'proposals', text: t(".add_proposal") } %>
-        <%= form.data_picker(:proposals, picker_options, prompt_params) {|item| { url: 'proposals', text: "##{item.id}- #{item.title}" }} %>
+        <% picker_options = { id: "decidim_accountability_proposals", class: "picker-multiple", name: "result[proposal_ids]", multiple: true }
+        prompt_params= { url: "proposals", text: t(".add_proposal") } %>
+        <%= form.data_picker(:proposals, picker_options, prompt_params) {|item| { url: "proposals", text: "##{item.id}- #{item.title}" }} %>
       <% end %>
     </div>
 
@@ -65,8 +65,7 @@
         <%= form.select :project_ids,
                         @form.projects,
                         {},
-                        { multiple: true, class: "chosen-select" }
-        %>
+                        { multiple: true, class: "chosen-select" } %>
       <% end %>
     </div>
 

data/app/views/decidim/accountability/admin/results/_proposals.html.erb

@@ -2,11 +2,11 @@
   <h1><%= t(".current_selection") %></h1>
 </div>
 <div class="picker-content">
-  <input type="text" name="proposal-search" id="data_picker-autocomplete"/>
+  <input type="text" name="proposal-search" id="data_picker-autocomplete" />
 </div>
 <div class="picker-footer">
   <div class="buttons button--double">
-    <a id="proposal-picker-choose" class="button mute" href="proposals" data-picker-value="" data-picker-text="" ><%= t(".select") %></a>
+    <a id="proposal-picker-choose" class="button mute" href="proposals" data-picker-value="" data-picker-text=""><%= t(".select") %></a>
     <a class="button clear" data-close=""><%= t(".close") %></a>
   </div>
 </div>

data/app/views/decidim/accountability/admin/results/edit.html.erb

@@ -1,5 +1,5 @@
-<%=  decidim_form_for(@form, html: { class: "form edit_result" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
+<%= decidim_form_for(@form, html: { class: "form edit_result" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>

data/app/views/decidim/accountability/admin/results/index.html.erb

@@ -4,7 +4,7 @@
       <%= link_to "#{translated_attribute(parent_result.title)} > ", edit_result_path(parent_result) if parent_result %>
       <%= t(".title") %>
       <div class="button--title">
-        <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), new_result_path(parent_id: parent_result), class: 'button tiny button--simple' if can? :manage, current_feature %>
+        <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), new_result_path(parent_id: parent_result), class: "button tiny button--simple" if can? :manage, current_component %>
         <%= render partial: "decidim/accountability/admin/shared/subnav" unless parent_result %>
         <%= export_dropdown %>
       </div>
@@ -29,19 +29,19 @@
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank %>
 
-                <% if can? :update, current_feature %>
+                <% if can? :update, current_component %>
                   <%= icon_link_to "plus", results_path(parent_id: result.id), t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), class: "action-icon--plus" %>
                 <% end %>
 
-                <% if can? :update, current_feature %>
+                <% if can? :update, current_component %>
                   <%= icon_link_to "clock", result_timeline_entries_path(result), t("actions.timeline_entries", scope: "decidim.accountability"), class: "action-icon--clock" %>
                 <% end %>
 
-                <% if can? :update, current_feature %>
+                <% if can? :update, current_component %>
                   <%= icon_link_to "pencil", edit_result_path(result), t("actions.edit", scope: "decidim.accountability"), class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :destroy, current_feature %>
+                <% if can? :destroy, current_component %>
                   <%= icon_link_to "circle-x", result_path(result), t("actions.destroy", scope: "decidim.accountability"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")) } %>
                 <% end %>
               </td>

data/app/views/decidim/accountability/admin/results/new.html.erb

@@ -1,5 +1,5 @@
-<%=  decidim_form_for(@form, html: { class: "form new_result" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
+<%= decidim_form_for(@form, html: { class: "form new_result" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>

data/app/views/decidim/accountability/admin/shared/_subnav.html.erb

@@ -1 +1 @@
-<%= link_to t(".statuses"), statuses_path, class: 'button tiny button--simple' %>
+<%= link_to t(".statuses"), statuses_path, class: "button tiny button--simple" %>

data/app/views/decidim/accountability/admin/statuses/edit.html.erb

@@ -1,8 +1,7 @@
-<%=  decidim_form_for(@form, html: { class: "form edit_status" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
+<%= decidim_form_for(@form, html: { class: "form edit_status" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>
-

data/app/views/decidim/accountability/admin/statuses/index.html.erb

@@ -2,7 +2,7 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.status.name", scope: "decidim.accountability.admin")), new_status_path, class: 'button tiny button--title' if can? :manage, current_feature %>
+      <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.status.name", scope: "decidim.accountability.admin")), new_status_path, class: "button tiny button--title" if can? :manage, current_component %>
       <%= render partial: "decidim/accountability/admin/shared/subnav" %>
     </h2>
   </div>
@@ -27,11 +27,11 @@
               <td><%= truncate translated_attribute(status.description), lenght: 50 %></td>
               <td><%= status.progress %></td>
               <td class="table-list__actions">
-                <% if can? :update, current_feature %>
+                <% if can? :update, current_component %>
                   <%= icon_link_to "pencil", edit_status_path(status), t("actions.edit", scope: "decidim.accountability"), class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :destroy, current_feature %>
+                <% if can? :destroy, current_component %>
                   <%= icon_link_to "circle-x", status_path(status), t("actions.destroy", scope: "decidim.accountability"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.accountability", name: t("models.status.name", scope: "decidim.accountability.admin")) } %>
                 <% end %>
               </td>

data/app/views/decidim/accountability/admin/statuses/new.html.erb

@@ -1,8 +1,7 @@
-<%=  decidim_form_for(@form, html: { class: "form new_status" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
+<%= decidim_form_for(@form, html: { class: "form new_status" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>
   </div>
 <% end %>
-

data/app/views/decidim/accountability/admin/timeline_entries/edit.html.erb

@@ -1,8 +1,7 @@
-<%=  decidim_form_for([result, @form], html: { class: "form edit_timeline_entry" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
+<%= decidim_form_for([result, @form], html: { class: "form edit_timeline_entry" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>
-

data/app/views/decidim/accountability/admin/timeline_entries/index.html.erb

@@ -1,9 +1,9 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= link_to "#{translated_attribute(result.title)} > ", edit_result_path(result)%>
+      <%= link_to "#{translated_attribute(result.title)} > ", edit_result_path(result) %>
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.timeline_entry.name", scope: "decidim.accountability.admin")), new_result_timeline_entry_path(result), class: 'button tiny button--title' if can? :manage, current_feature %>
+      <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.timeline_entry.name", scope: "decidim.accountability.admin")), new_result_timeline_entry_path(result), class: "button tiny button--title" if can? :manage, current_component %>
     </h2>
   </div>
 
@@ -23,11 +23,11 @@
               <td><%= timeline_entry.entry_date %><br /></td>
               <td><%= translated_attribute(timeline_entry.description) %></td>
               <td class="table-list__actions">
-                <% if can? :update, current_feature %>
+                <% if can? :update, current_component %>
                   <%= icon_link_to "pencil", edit_result_timeline_entry_path(timeline_entry.result, timeline_entry), t("actions.edit", scope: "decidim.accountability"), class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :destroy, current_feature %>
+                <% if can? :destroy, current_component %>
                   <%= icon_link_to "circle-x", result_timeline_entry_path(timeline_entry.result, timeline_entry), t("actions.destroy", scope: "decidim.accountability"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.accountability") } %>
                 <% end %>
               </td>

data/app/views/decidim/accountability/admin/timeline_entries/new.html.erb

@@ -1,8 +1,7 @@
-<%=  decidim_form_for([result, @form], html: { class: "form new_timeline_entry" }) do |f| %>
-  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
+<%= decidim_form_for([result, @form], html: { class: "form new_timeline_entry" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>
   </div>
 <% end %>
-

data/app/views/decidim/accountability/results/_home_categories.html.erb

@@ -28,14 +28,14 @@
                 <p class="heading3">
                 <%= link_to translated_attribute(category.name),results_path(filter: { category_id: category, scope_id: current_scope }) %></p>
 
-                <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
+                <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
                   <div class="progress">
                     <div class="progress-meter" style="width:<%= progress_calculator(current_scope, category.id) %>%"></div>
                   </div>
                 <% end %>
 
                 <div class="progress-info">
-                  <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
+                  <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
                     <div class="progress-figure heading3">
                       <%= display_percentage progress_calculator(current_scope, category.id) %>
                     </div>
@@ -55,7 +55,7 @@
                       <div class="category--line">
                         <strong><%= translated_attribute(subcategory.name) %></strong>
 
-                        <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, subcategory.id).present? %>
+                        <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, subcategory.id).present? %>
                           <div class="progress-figure heading3">
                             <%= display_percentage progress_calculator(current_scope, subcategory.id) %>
                           </div>

data/app/views/decidim/accountability/results/_home_header.html.erb

@@ -1,10 +1,10 @@
 <div class="intro section">
   <div class="row">
     <div class="small-12 medium-7 columns">
-      <%== translated_attribute feature_settings.intro %>
+      <%== translated_attribute component_settings.intro %>
     </div>
 
-    <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, nil).present? %>
+    <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, nil).present? %>
       <div class="small-12 medium-5 columns">
         <div class="progress-level">
           <p><%= t(".global_status") %></p>

data/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb

@@ -1,6 +1,6 @@
 <div class="lines-breadcrumb">
   <%= link_to t(".global"), root_path %>
-  <% if feature_settings.display_progress_enabled? %>
+  <% if component_settings.display_progress_enabled? %>
     <span class="percentage"><%= display_percentage progress_calculator(current_scope, nil) %></span>
   <% end %>
 
@@ -8,7 +8,7 @@
     <span class="breadcrumb--separator">></span>
     <div>
       <%= link_to translated_attribute(category.parent.name), results_path(filter: { category_id: category.parent_id, scope_id: current_scope }) %>
-      <% if feature_settings.display_progress_enabled? %>
+      <% if component_settings.display_progress_enabled? %>
         <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.parent_id) %></span>
       <% end %>
     </div>
@@ -18,7 +18,7 @@
     <span class="breadcrumb--separator">></span>
     <div>
       <%= link_to translated_attribute(category.name), results_path(filter: { category_id: category.id, scope_id: current_scope }) %>
-      <% if feature_settings.display_progress_enabled? %>
+      <% if component_settings.display_progress_enabled? %>
         <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.id) %></span>
       <% end %>
     </div>
@@ -28,7 +28,7 @@
     <span class="breadcrumb--separator">></span>
     <div>
       <%= link_to translated_attribute(result.parent.title), result_path(result.parent, filter: { scope_id: current_scope }) %>
-      <% if feature_settings.display_progress_enabled? %>
+      <% if component_settings.display_progress_enabled? %>
         <span class="percentage"><%= display_percentage result.parent.progress %></span>
       <% end %>
     </div>

data/app/views/decidim/accountability/results/_results_leaf.html.erb

@@ -34,11 +34,11 @@
             </div>
           <% end %>
 
-          <% if feature_settings.display_progress_enabled? && result.progress.present? %>
+          <% if component_settings.display_progress_enabled? && result.progress.present? %>
             <div class="card--list__data">
               <span class="card--list__data__number"><%= display_percentage result.progress %></span>
             </div>
-          <% end%>
+          <% end %>
         </div>
       <% end %>
     </div>

data/app/views/decidim/accountability/results/_results_parent.html.erb

@@ -19,16 +19,14 @@
             <span class="text-small"><%= heading_leaf_level_results(result.children.count) %></span>
           <% end %>
 
-          <% if feature_settings.display_progress_enabled? && result.progress.present? %>
+          <% if component_settings.display_progress_enabled? && result.progress.present? %>
             <div class="card--list__data">
               <span class="card--list__data__number"><%= display_percentage result.progress %></span>
             </div>
-          <% end%>
+          <% end %>
         </div>
       <% end %>
     </div>
     <%= decidim_paginate results, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
   </div>
 </div>
-
-

data/app/views/decidim/accountability/results/_scope_filters.html.erb

@@ -1,6 +1,6 @@
 <div class="scope-filters section">
   <% if current_participatory_space.has_subscopes? %>
-    <div><%= t('results.filters.scopes', scope: "decidim.accountability") %></div>
+    <div><%= t("results.filters.scopes", scope: "decidim.accountability") %></div>
 
     <ul class="tags tags--action">
       <li <%= active_class_if_current(nil) %>><%= link_to t("results.filters.all", scope: "decidim.accountability"), url_for(filter: { category_id: category.try(:id) }) %></li>

data/app/views/decidim/accountability/results/_search.html.erb

@@ -1,10 +1,10 @@
 <%= form_tag results_path, method: :get do %>
   <div class="filters__search">
     <div class="input-group">
-      <%= search_field_tag "filter[search_text]", nil, label: false, class: "input-group-field", placeholder: t('.search'), value: "" %>
+      <%= search_field_tag "filter[search_text]", nil, label: false, class: "input-group-field", placeholder: t(".search"), value: "" %>
       <div class="input-group-button">
         <button type="submit" class="button button--muted">
-          <%= icon "magnifying-glass", aria_label: t('.search') %>
+          <%= icon "magnifying-glass", aria_label: t(".search") %>
         </button>
       </div>
     </div>

data/app/views/decidim/accountability/results/_show_leaf.html.erb

@@ -9,7 +9,7 @@
     </div>
 
     <div class="row">
-      <% if feature_settings.display_progress_enabled? && result.progress.present? %>
+      <% if component_settings.display_progress_enabled? && result.progress.present? %>
         <div class="columns section mediumlarge-3 mediumlarge-push-9">
           <div class="progress-level">
             <div class="progress-label">
@@ -58,7 +58,7 @@
         </div>
       </div>
 
-      <hr>
+      <hr />
 
       <div class="small-12 mediumlarge-8 large-9 columns">
         <div class="section result-description">