decidim-accountability 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7c8c9e4ccd89572613111e08e1641635fb6d4be2e4a2c1742f555651aca82f
-  data.tar.gz: 3dafb6d76fd6ab4458cc9717c90fa784ee4f6004148c5dcde36120af9c86c83d
+  metadata.gz: 4a65df5014a44d7d4823b90e57aa405fcd189d5b41642109e63e8df91651533f
+  data.tar.gz: 2b8a1b55271be035047b779685a77404283190de1b15cee67a75415757ed9658
 SHA512:
-  metadata.gz: a86dcde9dc1acc763491537b368b50b09e03923d30f6732343588092154708f451ea41fa472ddd392103292dcee5d660f64d6ae617c4734f02ea06330e834bd0
-  data.tar.gz: 673209eb1645e24857c7171db27f723ce3c07e366f67d0cd8f0e6f5d6641824a80e8a77c18f778f0d8d78e2892532d4235cbc23149637152690e09aea56860ca
+  metadata.gz: b85f61879c2363725b2bd2022ecf85e31d91d4918bf655da887e90727e97b3a788fe61a016bde1354cb60d50b5503aa991718a18de0699c2e26ff002aaea5052
+  data.tar.gz: 3b81f8ba6e0c6a742d5806a5f82cceea466d6f3ee7077053f617ccf3d4612c25d3c22814736865df46b8098f00f7b3d8da23df100100521459b20f59efd32821

data/app/commands/decidim/accountability/admin/create_result.rb

@@ -44,7 +44,9 @@ module Decidim
             start_date: @form.start_date,
             end_date: @form.end_date,
             progress: @form.progress,
-            decidim_accountability_status_id: @form.decidim_accountability_status_id
+            decidim_accountability_status_id: @form.decidim_accountability_status_id,
+            external_id: @form.external_id.presence,
+            weight: @form.weight
           )
         end
 

data/app/commands/decidim/accountability/admin/update_result.rb

@@ -47,7 +47,9 @@ module Decidim
             start_date: @form.start_date,
             end_date: @form.end_date,
             progress: @form.progress,
-            decidim_accountability_status_id: @form.decidim_accountability_status_id
+            decidim_accountability_status_id: @form.decidim_accountability_status_id,
+            external_id: @form.external_id.presence,
+            weight: @form.weight
           )
         end
 

data/app/controllers/decidim/accountability/admin/results_controller.rb

@@ -8,11 +8,15 @@ module Decidim
         helper_method :results, :parent_result, :parent_results, :statuses
 
         def new
+          enforce_permission_to :create, :result
+
           @form = form(ResultForm).instance
           @form.parent_id = params[:parent_id]
         end
 
         def create
+          enforce_permission_to :create, :result
+
           @form = form(ResultForm).from_params(params)
 
           CreateResult.call(@form) do
@@ -29,10 +33,14 @@ module Decidim
         end
 
         def edit
+          enforce_permission_to :update, :result, result: result
+
           @form = form(ResultForm).from_model(result)
         end
 
         def update
+          enforce_permission_to :update, :result, result: result
+
           @form = form(ResultForm).from_params(params)
 
           UpdateResult.call(@form, result) do
@@ -49,6 +57,8 @@ module Decidim
         end
 
         def destroy
+          enforce_permission_to :destroy, :result, result: result
+
           DestroyResult.call(result, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("results.destroy.success", scope: "decidim.accountability.admin")

data/app/controllers/decidim/accountability/admin/statuses_controller.rb

@@ -8,10 +8,14 @@ module Decidim
         helper_method :statuses
 
         def new
+          enforce_permission_to :create, :status
+
           @form = form(StatusForm).instance
         end
 
         def create
+          enforce_permission_to :create, :status
+
           @form = form(StatusForm).from_params(params)
 
           CreateStatus.call(@form) do
@@ -28,10 +32,14 @@ module Decidim
         end
 
         def edit
+          enforce_permission_to :update, :status, status: status
+
           @form = form(StatusForm).from_model(status)
         end
 
         def update
+          enforce_permission_to :update, :status, status: status
+
           @form = form(StatusForm).from_params(params)
 
           UpdateStatus.call(@form, status) do
@@ -48,6 +56,8 @@ module Decidim
         end
 
         def destroy
+          enforce_permission_to :destroy, :status, status: status
+
           status.destroy!
 
           flash[:notice] = I18n.t("statuses.destroy.success", scope: "decidim.accountability.admin")

data/app/controllers/decidim/accountability/admin/timeline_entries_controller.rb

@@ -8,10 +8,14 @@ module Decidim
         helper_method :result, :timeline_entries
 
         def new
+          enforce_permission_to :create, :timeline_entry
+
           @form = form(TimelineEntryForm).instance
         end
 
         def create
+          enforce_permission_to :create, :timeline_entry
+
           @form = form(TimelineEntryForm).from_params(params)
           @form.decidim_accountability_result_id = params[:result_id]
 
@@ -29,10 +33,14 @@ module Decidim
         end
 
         def edit
+          enforce_permission_to :update, :timeline_entry, timeline_entry: timeline_entry
+
           @form = form(TimelineEntryForm).from_model(timeline_entry)
         end
 
         def update
+          enforce_permission_to :update, :timeline_entry, timeline_entry: timeline_entry
+
           @form = form(TimelineEntryForm).from_params(params)
 
           UpdateTimelineEntry.call(@form, timeline_entry) do
@@ -49,6 +57,8 @@ module Decidim
         end
 
         def destroy
+          enforce_permission_to :destroy, :timeline_entry, timeline_entry: timeline_entry
+
           timeline_entry.destroy!
 
           flash[:notice] = I18n.t("timeline_entries.destroy.success", scope: "decidim.accountability.admin")

data/app/forms/decidim/accountability/admin/result_form.rb

@@ -20,9 +20,10 @@ module Decidim
         attribute :progress, Float
         attribute :decidim_accountability_status_id, Integer
         attribute :parent_id, Integer
+        attribute :external_id, String
+        attribute :weight, Float
 
         validates :title, translatable_presence: true
-        validates :description, translatable_presence: true
 
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }

data/app/models/decidim/accountability/result.rb

@@ -29,7 +29,7 @@ module Decidim
       def self.order_randomly(seed)
         transaction do
           connection.execute("SELECT setseed(#{connection.quote(seed)})")
-          order("RANDOM()").load
+          order(Arel.sql("RANDOM()")).load
         end
       end
 
@@ -43,8 +43,15 @@ module Decidim
         parent.update_progress!
       end
 
+      # Public: There are two ways to update parent's progress:
+      #   - using weights, in which case each progress is multiplied by the weigth and them summed
+      #   - not using weights, and using the average of progress of each children
       def update_progress!
-        self.progress = children.average(:progress)
+        self.progress = if children_use_weighted_progress?
+                          children.sum { |result| (result.progress.presence || 0) * (result.weight.presence || 1) }
+                        else
+                          children.average(:progress)
+                        end
         save!
       end
 
@@ -67,6 +74,13 @@ module Decidim
       def comments_have_votes?
         true
       end
+
+      private
+
+      # Private: When a row uses weight 1 and there's more than one, weight shouldn't be considered
+      def children_use_weighted_progress?
+        children.length == 1 || children.pluck(:weight).none? { |weight| weight == 1.0 }
+      end
     end
   end
 end

data/app/permissions/decidim/accountability/admin/permissions.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      class Permissions < Decidim::DefaultPermissions
+        def permissions
+          return permission_action if permission_action.scope != :admin
+
+          permission_action.allow! if can_perform_actions_on?(:result, result)
+          permission_action.allow! if can_perform_actions_on?(:status, status)
+          permission_action.allow! if can_perform_actions_on?(:timeline_entry, timeline_entry)
+
+          permission_action
+        end
+
+        private
+
+        def result
+          @result ||= context.fetch(:result, nil)
+        end
+
+        def status
+          @status ||= context.fetch(:status, nil)
+        end
+
+        def timeline_entry
+          @timeline_entry ||= context.fetch(:timeline_entry, nil)
+        end
+
+        def can_perform_actions_on?(subject, resource)
+          return unless permission_action.subject == subject
+
+          case permission_action.action
+          when :create
+            true
+          when :update, :destroy
+            resource.present?
+          else
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/accountability/permissions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class Permissions < Decidim::DefaultPermissions
+      def permissions
+        return permission_action unless user
+
+        # Delegate the admin permission checks to the admin permissions class
+        return Decidim::Accountability::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
+
+        permission_action
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Decidim
       end
 
       def comments_count
-        Decidim::Comments::Comment.where(commentable: proposals).count
+        Decidim::Comments::Comment.where(commentable: proposals.to_a).count
       end
 
       def attendees_count

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_component %>
+        <%= 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 allowed_to? :create, :result %>
         <%= 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_component %>
+                <% if allowed_to? :update, :result, result: result %>
                   <%= 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_component %>
+                <% if allowed_to? :update, :result, result: result %>
                   <%= 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_component %>
+                <% if allowed_to? :update, :result, result: result %>
                   <%= icon_link_to "pencil", edit_result_path(result), t("actions.edit", scope: "decidim.accountability"), class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :destroy, current_component %>
+                <% if allowed_to? :destroy, :result, result: result %>
                   <%= 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/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_component %>
+      <%= 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 allowed_to? :create, :status %>
       <%= 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_component %>
+                <% if allowed_to? :update, :status, status: status %>
                   <%= icon_link_to "pencil", edit_status_path(status), t("actions.edit", scope: "decidim.accountability"), class: "action-icon--edit" %>
                 <% end %>
 
-                <% if can? :destroy, current_component %>
+                <% if allowed_to? :destroy, :status, status: status %>
                   <%= 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/timeline_entries/index.html.erb

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= 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_component %>
+      <%= 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 allowed_to? :create, :timeline_entry %>
     </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_component %>
+                <% if allowed_to? :update, :timeline_entry, timeline_entry: timeline_entry %>
                   <%= 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_component %>
+                <% if allowed_to? :destroy, :timeline_entry, timeline_entry: timeline_entry %>
                   <%= 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/results/_linked_results.html.erb

@@ -1,6 +1,5 @@
 <div class="card card--action card--list">
   <% resources.each do |result| %>
-    <% next unless result.component.published? %>
     <div class="card--list__item">
       <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
       <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>

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

@@ -63,7 +63,7 @@
       <div class="small-12 mediumlarge-8 large-9 columns">
         <div class="section result-description">
           <%== translated_attribute result.description %>
-          <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
+          <%= cell "decidim/tags", result, context: {extra_classes: ["tags--result"]} %>
         </div>
       </div>
 

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

@@ -12,7 +12,7 @@
           <div class="description">
             <%== translated_attribute result.description %>
           </div>
-          <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
+          <%= cell "decidim/tags", result, context: {extra_classes: ["tags--result"]} %>
 
           <%= render partial: "results_leaf", locals: { results: result.children.page(1).per(result.children_count), total_count: result.children_count } %>
         </div>

data/config/locales/ca.yml

@@ -21,6 +21,13 @@ ca:
       timeline_entry:
         description: Descripció
         entry_date: Data
+    models:
+      decidim/accountability/proposal_linked_event: Proposta inclosa en un resultat
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Resultat
+        other: Resultats
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ ca:
         see_all_results: Veure tots els resultats
     resource_links:
       included_projects:
-        result_projects: Projectes inclosos en aquest resultat
+        result_project: Projectes inclosos en aquest resultat
       included_proposals:
-        result_proposals: Propostes incloses en aquest resultat
+        result_proposal: Propostes incloses en aquest resultat

data/config/locales/en.yml

@@ -22,6 +22,13 @@ en:
       timeline_entry:
         description: Description
         entry_date: Date
+    models:
+      decidim/accountability/proposal_linked_event: Proposal included in a result
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Result
+        other: Results
   decidim:
     accountability:
       actions:
@@ -203,6 +210,6 @@ en:
         see_all_results: See all results
     resource_links:
       included_projects:
-        result_projects: Projects included in this result
+        result_project: Projects included in this result
       included_proposals:
-        result_proposals: Proposals included in this result
+        result_proposal: Proposals included in this result

data/config/locales/es.yml

@@ -21,6 +21,13 @@ es:
       timeline_entry:
         description: Descripción
         entry_date: Fecha
+    models:
+      decidim/accountability/proposal_linked_event: Propuesta incluida en un resultado
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Resultado
+        other: Resultados
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ es:
         see_all_results: Ver todos los resultados
     resource_links:
       included_projects:
-        result_projects: Proyectos incluidos en este resultado
+        result_project: Proyectos incluidos en este resultado
       included_proposals:
-        result_proposals: Propuestas incluidas en este resultado
+        result_proposal: Propuestas incluidas en este resultado

data/config/locales/eu.yml

@@ -21,6 +21,13 @@ eu:
       timeline_entry:
         description: Descripción
         entry_date: Data
+    models:
+      decidim/accountability/proposal_linked_event: Emaitza batean sartutako proposamena
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Emaitza
+        other: Emaitzak
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ eu:
         see_all_results: Ikusi emaitza guztiak
     resource_links:
       included_projects:
-        result_projects: Emaitza honetan sartutako proiektuak
+        result_project: Emaitza honetan sartutako proiektuak
       included_proposals:
-        result_proposals: Emaitza honetan jasotako proposamenak
+        result_proposal: Emaitza honetan jasotako proposamenak

data/config/locales/fi.yml

@@ -21,6 +21,13 @@ fi:
       timeline_entry:
         description: Kuvaus
         entry_date: Päivämäärä
+    models:
+      decidim/accountability/proposal_linked_event: Ehdotus sisältyy tulokseen
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Tulos
+        other: tulokset
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ fi:
         see_all_results: Katso kaikki tulokset
     resource_links:
       included_projects:
-        result_projects: Tähän tulokseen liittyvät hankkeet
+        result_project: Tähän tulokseen liittyvät hankkeet
       included_proposals:
-        result_proposals: Tähän tulokseen liittyvät ehdotukset
+        result_proposal: Tähän tulokseen liittyvät ehdotukset

data/config/locales/fr.yml

@@ -21,6 +21,13 @@ fr:
       timeline_entry:
         description: Description
         entry_date: Date
+    models:
+      decidim/accountability/proposal_linked_event: Proposition incluse dans un résultat
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Résultat
+        other: Résultats
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ fr:
         see_all_results: Voir tous les résultats
     resource_links:
       included_projects:
-        result_projects: Projets inclus dans ce résultat
+        result_project: Projets inclus dans ce résultat
       included_proposals:
-        result_proposals: Propositions incluses dans ce résultat
+        result_proposal: Propositions incluses dans ce résultat

data/config/locales/gl.yml

@@ -21,6 +21,13 @@ gl:
       timeline_entry:
         description: Descrición
         entry_date: Data
+    models:
+      decidim/accountability/proposal_linked_event: Proposta incluída nun resultado
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Resultado
+        other: Resultados
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ gl:
         see_all_results: Ver todos os resultados
     resource_links:
       included_projects:
-        result_projects: Proxectos incluídos neste resultado
+        result_project: Proxectos incluídos neste resultado
       included_proposals:
-        result_proposals: Propostas incluídas neste resultado
+        result_proposal: Propostas incluídas neste resultado

data/config/locales/it.yml

@@ -21,6 +21,13 @@ it:
       timeline_entry:
         description: Descrizione
         entry_date: Data
+    models:
+      decidim/accountability/proposal_linked_event: Proposta inclusa in un risultato
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Risultato
+        other: risultati
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ it:
         see_all_results: Vedi tutti i risultati
     resource_links:
       included_projects:
-        result_projects: Progetti inclusi in questo risultato
+        result_project: Progetti inclusi in questo risultato
       included_proposals:
-        result_proposals: Proposte incluse in questo risultato
+        result_proposal: Proposte incluse in questo risultato

data/config/locales/nl.yml

@@ -21,6 +21,13 @@ nl:
       timeline_entry:
         description: Beschrijving
         entry_date: Datum
+    models:
+      decidim/accountability/proposal_linked_event: Voorstel opgenomen in een resultaat
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Resultaat
+        other: resultaten
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ nl:
         see_all_results: Bekijk alle resultaten
     resource_links:
       included_projects:
-        result_projects: Projecten opgenomen in dit resultaat
+        result_project: Projecten opgenomen in dit resultaat
       included_proposals:
-        result_proposals: Voorstellen opgenomen in dit resultaat
+        result_proposal: Voorstellen opgenomen in dit resultaat

data/config/locales/pl.yml

@@ -21,6 +21,15 @@ pl:
       timeline_entry:
         description: Opis
         entry_date: Data
+    models:
+      decidim/accountability/proposal_linked_event: Wniosek zawarty w wyniku
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Wynik
+        few: Wyniki
+        many: Wyniki
+        other: Wyniki
   decidim:
     accountability:
       actions:
@@ -204,6 +213,6 @@ pl:
         see_all_results: Zobacz wszystkie wyniki
     resource_links:
       included_projects:
-        result_projects: Projekty uwzględnione w tym wyniku
+        result_project: Projekty uwzględnione w tym wyniku
       included_proposals:
-        result_proposals: Propozycje zawarte w tym wyniku
+        result_proposal: Propozycje zawarte w tym wyniku

data/config/locales/pt-BR.yml

@@ -21,6 +21,13 @@ pt-BR:
       timeline_entry:
         description: Descrição
         entry_date: Encontro
+    models:
+      decidim/accountability/proposal_linked_event: Proposta incluída em um resultado
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Resultado
+        other: Resultados
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ pt-BR:
         see_all_results: Ver todos os resultados
     resource_links:
       included_projects:
-        result_projects: Projetos incluídos neste resultado
+        result_project: Projetos incluídos neste resultado
       included_proposals:
-        result_proposals: Propostas incluídas neste resultado
+        result_proposal: Propostas incluídas neste resultado

data/config/locales/pt.yml

@@ -21,6 +21,13 @@ pt:
       timeline_entry:
         description: Descrição
         entry_date: Encontro
+    models:
+      decidim/accountability/proposal_linked_event: Proposta incluída em um resultado
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Resultado
+        other: Resultados
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ pt:
         see_all_results: Ver todos os resultados
     resource_links:
       included_projects:
-        result_projects: Projetos incluídos neste resultado
+        result_project: Projetos incluídos neste resultado
       included_proposals:
-        result_proposals: Propostas incluídas neste resultado
+        result_proposal: Propostas incluídas neste resultado

data/config/locales/ru.yml

@@ -2,14 +2,17 @@ ru:
   activemodel:
     attributes:
       result:
+        decidim_accountability_status_id: Состояние
         decidim_category_id: Разряд
         decidim_scope_id: Охват
         description: Описание
         end_date: Дата завершения
         progress: Продвижение
         project_ids: Включенные проекты
+        proposals: Включенные предложения
         start_date: Дата начала
         title: Название
+        updated_at: 'Обновлено:'
       status:
         description: Описание
         key: Ключ
@@ -18,6 +21,15 @@ ru:
       timeline_entry:
         description: Описание
         entry_date: Дата
+    models:
+      decidim/accountability/proposal_linked_event: Предложение, включенное в этот итог
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Итог
+        few: Итога
+        many: Итогов
+        other: Итогов
   decidim:
     accountability:
       actions:
@@ -47,11 +59,17 @@ ru:
           edit:
             title: Редактировать итог
             update: Обновить итог
+          form:
+            add_proposal: Добавить предложение
           index:
             title: Итоги
           new:
             create: Создать итог
             title: Добавить итог
+          proposals:
+            close: Закрыть
+            current_selection: Текущий выбор
+            select: Выбрать
           update:
             invalid: При попытке обновить этот итог произошла ошибка
             success: Итог успешно обновлен
@@ -92,6 +110,14 @@ ru:
           update:
             invalid: При попытке обновить эту запись произошла ошибка
             success: Запись успешно обновлена
+      admin_log:
+        result:
+          create: "%{user_name} создал итог %{resource_name} в %{space_name}"
+          delete: "%{user_name} удалил итог %{resource_name} в %{space_name}"
+          update: "%{user_name} обновил итог %{resource_name} в %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Родительский объект не найден в базе данных (ID: %{id})'
       models:
         result:
           fields:
@@ -158,12 +184,35 @@ ru:
           version_index: Версия %{index}
     components:
       accountability:
+        name: Отчетность
         settings:
           global:
             categories_label: Название для "Разряды"
+            comments_enabled: Комментарии включены
+            display_progress_enabled: Показывать ход выполнения
+            heading_leaf_level_results: Название для "Проекты"
+            heading_parent_level_results: Название для "Итоги"
+            intro: Вступление
             subcategories_label: Название для "Подразряды"
+          step:
+            comments_blocked: Комментарии выключены
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'Предложение «%{proposal_title}» было включено в итоги. Вы можете посмотреть его на странице:'
+          email_outro: Вы получили это уведомление, потому что вы следите за "%{proposal_title}". Вы можете отписаться от уведомлений, перейдя по приведенной выше ссылке.
+          email_subject: Обновление %{proposal_title}
+          notification_title: Предложение <a href="%{proposal_path}">%{proposal_title}</a> было включено в итог <a href="%{resource_path}">%{resource_title}</a>.
+    participatory_processes:
+      participatory_process_groups:
+        highlighted_results:
+          results: Итоги
+    participatory_spaces:
+      highlighted_results:
+        results: Итоги
+        see_all_results: Просмотреть все итоги
     resource_links:
       included_projects:
-        result_projects: Проекты, включенные в эти итоги
+        result_project: Проекты, включенные в эти итоги
       included_proposals:
-        result_proposals: Предложения, включенные в этот итог
+        result_proposal: Предложения, включенные в этот итог

data/config/locales/sv.yml

@@ -21,6 +21,13 @@ sv:
       timeline_entry:
         description: Beskrivning
         entry_date: Datum
+    models:
+      decidim/accountability/proposal_linked_event: Förslaget ingår i ett resultat
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Resultat
+        other: Resultat
   decidim:
     accountability:
       actions:
@@ -202,6 +209,6 @@ sv:
         see_all_results: Se alla resultat
     resource_links:
       included_projects:
-        result_projects: Projekt som ingår i detta resultat
+        result_project: Projekt som ingår i detta resultat
       included_proposals:
-        result_proposals: Förslag som ingår i detta resultat
+        result_proposal: Förslag som ingår i detta resultat

data/config/locales/uk.yml

@@ -21,6 +21,15 @@ uk:
       timeline_entry:
         description: Опис
         entry_date: Дата
+    models:
+      decidim/accountability/proposal_linked_event: Пропозиція, включена до підсумку
+  activerecord:
+    models:
+      decidim/accountability/result:
+        one: Підсумок
+        few: Підсумки
+        many: Підсумків
+        other: Підсумків
   decidim:
     accountability:
       actions:
@@ -204,6 +213,6 @@ uk:
         see_all_results: Переглянути всі підсумки
     resource_links:
       included_projects:
-        result_projects: Задуми, включені до цих підсумків
+        result_project: Задуми, включені до цих підсумків
       included_proposals:
-        result_proposals: Пропозиції, включені до цих підсумків
+        result_proposal: Пропозиції, включені до цих підсумків

data/db/migrate/20180508170210_add_weight_to_results.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWeightToResults < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_accountability_results, :weight, :float, default: 1.0
+  end
+end

data/db/migrate/20180508170647_add_external_id_to_results.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddExternalIdToResults < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_accountability_results, :external_id, :string, index: true
+  end
+end

data/lib/decidim/accountability/component.rb

@@ -7,12 +7,13 @@ Decidim.register_component(:accountability) do |component|
   component.admin_engine = Decidim::Accountability::AdminEngine
   component.icon = "decidim/accountability/icon.svg"
   component.stylesheet = "decidim/accountability/accountability"
+  component.permissions_class_name = "Decidim::Accountability::Permissions"
 
   component.on(:before_destroy) do |instance|
     raise StandardError, "Can't remove this component" if Decidim::Accountability::Result.where(component: instance).any?
   end
 
-  component.register_resource do |resource|
+  component.register_resource(:result) do |resource|
     resource.model_class_name = "Decidim::Accountability::Result"
     resource.template = "decidim/accountability/results/linked_results"
   end

data/lib/decidim/accountability/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -74,98 +74,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -214,6 +214,8 @@ files:
 - app/models/decidim/accountability/result.rb
 - app/models/decidim/accountability/status.rb
 - app/models/decidim/accountability/timeline_entry.rb
+- app/permissions/decidim/accountability/admin/permissions.rb
+- app/permissions/decidim/accountability/permissions.rb
 - app/presenters/decidim/accountability/admin_log/result_presenter.rb
 - app/presenters/decidim/accountability/admin_log/value_types/parent_presenter.rb
 - app/services/decidim/accountability/diff_renderer.rb
@@ -282,6 +284,8 @@ files:
 - db/migrate/20170623144902_add_children_counter_cache_to_results.rb
 - db/migrate/20170928073905_migrate_old_results.rb
 - db/migrate/20180305133145_rename_features_to_components_at_accountability.rb
+- db/migrate/20180508170210_add_weight_to_results.rb
+- db/migrate/20180508170647_add_external_id_to_results.rb
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
@@ -306,9 +310,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6