decidim-accountability 0.27.0.rc1 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c075f66ece3b892202c3936512fe378f3badd528a66d50e27c3b05e0139b330
-  data.tar.gz: 888ec8f73f7b72a36167359670cffb1228bfa30c29ed7f35f73213d30db35864
+  metadata.gz: 80a1546531a8958f63ece8c48a2bdfd099d60aefadc65422d323efcaabaa8f07
+  data.tar.gz: 86fbd396375f5595c67af9db4d313c7f4f0c8b45f0eb811760804e7a83b02002
 SHA512:
-  metadata.gz: 8e9e0be0ac5170614d786e784e310c2f30cc1f7e03ff9b3eb16fe1a3911beee160fcdb2f1f39f87dd3ebfda418325a634199b29ef25250bef55afb9ba7e73897
-  data.tar.gz: 07a0e0128905106e8ac06ffeda3b60ae1c820039637cc32011e7524521d6af0340e4a930f9c04f7f065d3ed7b0f1cd75ecc801889310d5d9f535597c0c4cd723
+  metadata.gz: 229c56dbafb9e5156418428870f3f6421dac77f0369b35e8950e76b98464fb54a86ed2f424302bae1edb302a2c53030df2cee2eaf070a2503d3f3eb20a7a54b1
+  data.tar.gz: 07412c01af6826e80cd8ed8d49f97c81a4b0905a34fc5ae81478a987cde1e11fe74c342a0927fd6b6a1751249435b72e1dfeba9be8e7f4db7d8f4d5f1453b9dd

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

@@ -30,9 +30,10 @@ module Decidim
 
         def can_perform_actions_on?(subject, resource)
           return unless permission_action.subject == subject
+          return false if can_create_grandchildren_results?
 
           case permission_action.action
-          when :create
+          when :create, :create_children
             true
           when :update, :destroy
             resource.present?
@@ -40,6 +41,11 @@ module Decidim
             false
           end
         end
+
+        def can_create_grandchildren_results?
+          result&.parent&.present? &&
+            permission_action.action == :create_children
+        end
       end
     end
   end

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

@@ -74,7 +74,7 @@
               <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 allowed_to? :update, :result, result: result %>
+                <% if allowed_to? :create_children, :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 %>
 

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

@@ -19,12 +19,12 @@
             <div class="text-small card--meta">
               <% if result.start_date %>
                 <strong><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></strong>
-                <span><%= result.start_date %></span>
+                <span><%= l result.start_date, format: :decidim_short %></span>
               <% end %>
 
               <% if result.end_date %>
                 <strong><%= t("models.result.fields.end_date", scope: "decidim.accountability") %></strong>
-                <span><%= result.end_date %></span>
+                <span><%= l result.end_date, format: :decidim_short %></span>
               <% end %>
 
               <% if result.status %>

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

@@ -31,14 +31,14 @@
           <div class="result-meta row">
             <% if result.start_date %>
               <div class="result-meta--label medium-2 columns"><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></div>
-              <div class="result-meta--data medium-10 columns"><%= result.start_date %></div>
+              <div class="result-meta--data medium-10 columns"><%= l result.start_date, format: :decidim_short %></div>
             <% end %>
           </div>
 
           <div class="result-meta row">
             <% if result.end_date %>
               <div class="result-meta--label medium-2 columns"><%= t("models.result.fields.end_date", scope: "decidim.accountability") %></div>
-              <div class="result-meta--data medium-10 columns"><%= result.end_date %></div>
+              <div class="result-meta--data medium-10 columns"><%= l result.end_date, format: :decidim_short %></div>
             <% end %>
           </div>
 

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

@@ -10,7 +10,7 @@
           <div class="timeline__info">
             <div class="timeline__description">
               <span class="timeline__date text-small">
-                <%= timeline_entry.entry_date %>
+                <%= l timeline_entry.entry_date, format: :decidim_short %>
               </span>
               <h4 class="timeline__title">
                 <%= translated_attribute timeline_entry.title %>

data/config/locales/am-ET.yml

@@ -1,2 +1 @@
----
 am:

data/config/locales/eo.yml

@@ -1,2 +1 @@
----
 eo:

data/config/locales/et.yml

@@ -1,2 +1 @@
----
 et:

data/config/locales/hr.yml

@@ -1,2 +1 @@
----
 hr:

data/config/locales/hu.yml

@@ -5,7 +5,7 @@ hu:
       result:
         decidim_accountability_status_id: Állapot
         decidim_category_id: Kategória
-        decidim_scope_id: Hatáskör
+        decidim_scope_id: Hatókör
         description: Leírás
         end_date: Befejezés dátuma
         progress: Folyamat
@@ -22,6 +22,7 @@ hu:
       timeline_entry:
         description: Leírás
         entry_date: Dátum
+        title: Cím
     models:
       decidim/accountability/proposal_linked_event: Az eredményhez kapcsolódó javaslat
       decidim/accountability/result_progress_updated_event: Az eredmények frissítve
@@ -95,7 +96,7 @@ hu:
           index:
             title: Állapotok
           new:
-            create: Státusz létrehozása
+            create: Állapot létrehozása
             title: Új állapot
           update:
             invalid: Probléma történt az állapot frissítésekor
@@ -110,7 +111,7 @@ hu:
             title: Bejegyzés szerkesztése
             update: Bejegyzés frissítése
           index:
-            title: Projekt ütemtervének bejegyzései
+            title: Projekt idővonal bejegyzései
           new:
             create: Bejegyzés létrehozása
             title: Új bejegyzés
@@ -122,6 +123,14 @@ hu:
           create: "%{user_name} által létrehozott eredmény: %{resource_name} (itt: %{space_name})"
           delete: "%{user_name} törölte a(z) %{resource_name} eredményt innen: %{space_name}"
           update: "%{user_name} frissítette a(z) %{resource_name} eredmény itt: %{space_name}"
+        status:
+          create: "%{user_name} létrehozta a(z) %{resource_name} állapotot"
+          delete: "%{user_name} törölte a(z) %{resource_name} állapotot"
+          update: "%{user_name} frissítette a(z) %{resource_name} állapotot"
+        timeline_entry:
+          create: "%{user_name} létrehozta az %{resource_name} idővonal bejegyzést"
+          delete: "%{user_name} törölte a(z) %{resource_name} idővonal bejegyzést"
+          update: "%{user_name} frissítette a %{resource_name} idővonal bejegyzést"
         value_types:
           parent_presenter:
             not_found: 'Nem található az adatbázisban (ID: %{id})'
@@ -160,6 +169,7 @@ hu:
         timeline_entry:
           fields:
             entry_date: Dátum
+            title: Cím
       result_m:
         executed: Végrehajtva
         view: Nézet
@@ -170,7 +180,7 @@ hu:
             other: "%{count} találat"
         filters:
           all: Összes
-          scopes: Hatáskörök
+          scopes: Hatókörök
         home:
           categories_label: Kategóriák
           subcategories_label: Alkategóriák
@@ -225,13 +235,13 @@ hu:
       accountability:
         proposal_linked:
           email_intro: 'A "%{proposal_title}" nevű javaslat szerepel az eredményben. Erről az oldalról érhető el:'
-          email_outro: Ezt az értesítést azért kaptad, mert követed a(z) "%{proposal_title}" nevű ajánlást. Az értesítéseket a következő linkre kattintva kapcsolhatod ki.
+          email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{proposal_title}". Az értesítéseket az előző linkre kattintva kapcsolhatod ki.'
           email_subject: A %{proposal_title} frissítve lett
           notification_title: 'A(z) <a href="%{proposal_path}">%{proposal_title}</a> javaslat szerepel ebben a(z) eredményben: <a href="%{resource_path}">%{resource_title}</a>.'
         result_progress_updated:
           email_intro: 'A "%{resource_title}" eredmény, amely magában foglalja a "%{proposal_title}" javaslatot, most már %{progress}% -ban teljes. Láthatod ezt erről oldalról:'
-          email_outro: Ezt az értesítést azért kaptad, mert "%{proposal_title}" -t követed, és ez a javaslat szerepel a "%{resource_title}" eredményben. Leállíthatoa az értesítések fogadását követve az előző linket.
-          email_subject: '%{resource_title} frissítése'
+          email_outro: Ezt az értesítést azért kaptad, mert "%{proposal_title}" -t követed, és ez a javaslat szerepel a "%{resource_title}" eredményben. Leállíthatod az értesítések fogadását követve az előző linket.
+          email_subject: '%{resource_title} frissítése folyamatban'
           notification_title: Az eredmény <a href="%{resource_path}">%{resource_title}</a>, amely magában foglalja a <a href="%{proposal_path}">%{proposal_title}</a>javaslatot, most %{progress}%-ban teljes.
     metrics:
       results:
@@ -243,8 +253,8 @@ hu:
         see_all: Eredmények megtekintése (%{count})
     resource_links:
       included_projects:
-        result_project: Ebben az eredményben szereplő projektek
+        result_project: Az eredményben szereplő projektek
       included_proposals:
-        result_proposal: Az eredménybe foglalt javaslatok
+        result_proposal: Ebben az eredményben szereplő javaslatok
     statistics:
       results_count: Találatok

data/config/locales/ko.yml

@@ -1,2 +1 @@
----
 ko:

data/config/locales/mt.yml

@@ -1,2 +1 @@
----
 mt:

data/config/locales/nl.yml

@@ -22,6 +22,7 @@ nl:
       timeline_entry:
         description: Beschrijving
         entry_date: Datum
+        title: Titel
     models:
       decidim/accountability/proposal_linked_event: Voorstel opgenomen in een resultaat
       decidim/accountability/result_progress_updated_event: Resultaat voortgang bijgewerkt
@@ -50,6 +51,7 @@ nl:
         import_results:
           new:
             import: Importeren
+            info: "<p>Wij bevelen aan dat u de volgende stappen volgt:</p><ol><li>Maak de Statussen aan voor de Resultaten die u wilt toevoegen (<a href='%{link_new_status}' target='_blank'>link</a>)</li><li>Maak ten minste één Resultaat handmatig aan via dit Beheerderspaneel (<a href='%{link_new_result}' target='_blank'>link</a>) voordat u Importeren gebruikt, zodat u een beter inzicht hebt in het formaat en wat u moet invullen.</li><li>Download de Export in CSV-formaat (%{link_export_csv})</li><li>Voer de wijzigingen lokaal door. U kunt alleen de volgende kolommen van de CSV wijzigen:</li></ol><ul><li><b>category/id:</b> ID voor de Categorie</li><li><b>scope/id:</b> ID voor het Toepassingsgebied</li><li><b>parent/id:</b> ID van de hoofdwaarde (voor aanverwante resultaten). Facultatief</li><li><b>title/I18N:</b> Titel in X taal</li><li><b>description/I18N:</b> Beschrijving in X taal</li><li><b>start_date:</b> datum waarop de uitvoering van het resultaat start (formaat JJJJ-MM-DD)</li><li><b>end_date:</b> datum waarop de uitvoering van het resultaat eindigt (formaat JJJJ-MM-DD)</li><li><b>status/id:</b> ID van de status voor dit resultaat</li><li><b>progress:</b> Percentage (van 0 tot 100) van de uitvoering</li><li><b>proposals_ids:</b> intern ID van de aanverwante voorstellen (gescheiden door een komma). Het wordt automatisch omgezet in <span class='attribute-name'>proposal_url</span></li></ul>"
             link: link
             title: Importeer resultaten van CSV
         imports:
@@ -121,6 +123,14 @@ nl:
           create: "%{user_name} heeft het resultaat %{resource_name} gemaakt in %{space_name}"
           delete: "%{user_name} verwijderde het resultaat %{resource_name} in %{space_name}"
           update: "%{user_name} bijgewerkt resultaat %{resource_name} in %{space_name}"
+        status:
+          create: "%{user_name} heeft %{resource_name} status aangemaakt"
+          delete: "%{user_name} heeft %{resource_name} status verwijderd"
+          update: "%{user_name} heeft %{resource_name} status bijgewerkt"
+        timeline_entry:
+          create: "%{user_name} heeft timeline entry %{resource_name} aangemaakt"
+          delete: "%{user_name} heeft timeline entry %{resource_name} verwijderd"
+          update: "%{user_name} heeft timeline entry %{resource_name} bijgewerkt"
         value_types:
           parent_presenter:
             not_found: 'Het bovenliggende element is niet gevonden in de database (ID: %{id})'
@@ -159,6 +169,7 @@ nl:
         timeline_entry:
           fields:
             entry_date: Datum
+            title: Titel
       result_m:
         executed: Uitgevoerd
         view: Bekijk

data/config/locales/no.yml

@@ -22,6 +22,7 @@
       timeline_entry:
         description: Beskrivelse
         entry_date: Dato
+        title: Tittel
     models:
       decidim/accountability/proposal_linked_event: Forslag inkludert i et resultat
       decidim/accountability/result_progress_updated_event: Resultat fremgang oppdatert
@@ -62,10 +63,10 @@
           status:
             name: Status
           timeline_entry:
-            name: Tidslinje oppføring
+            name: Oppføring i tidslinjen
         results:
           create:
-            invalid: Det oppsto et problem med å opprette dette resultatet
+            invalid: Det oppstod et problem med å opprette dette resultatet
             success: Resultat ble opprettet
           destroy:
             success: Resultat ble slettet
@@ -122,6 +123,14 @@
           create: "%{user_name} opprettet resultat %{resource_name} i %{space_name}"
           delete: "%{user_name} slettet %{resource_name} resultatet i %{space_name}"
           update: "%{user_name} oppdaterte rusultat%{resource_name} i %{space_name}"
+        status:
+          create: "%{user_name} har opprettet statusen %{resource_name}"
+          delete: "%{user_name} slettet statusen %{resource_name}"
+          update: "%{user_name} oppdaterte statusen %{resource_name}"
+        timeline_entry:
+          create: "%{user_name} opprettet %{resource_name} i tidslinjen"
+          delete: "%{user_name} slettet %{resource_name} i tidslinjen"
+          update: "%{user_name} oppdaterte %{resource_name} i tidslinjen"
         value_types:
           parent_presenter:
             not_found: 'Overordnede ble ikke funnet i databasen (ID: %{id})'
@@ -160,6 +169,7 @@
         timeline_entry:
           fields:
             entry_date: Dato
+            title: Tittel
       result_m:
         executed: Utført
         view: Vis

data/config/locales/om-ET.yml

@@ -1,2 +1 @@
----
 om:

data/config/locales/pt-BR.yml

@@ -1,5 +1,5 @@
 ---
-pt:
+pt-BR:
   activemodel:
     attributes:
       result:

data/config/locales/so-SO.yml

@@ -1,2 +1 @@
----
 so:

data/config/locales/sv.yml

@@ -123,6 +123,10 @@ sv:
           create: "%{user_name} skapade resultatet %{resource_name} i %{space_name}"
           delete: "%{user_name} raderade resultatet %{resource_name} i %{space_name}"
           update: "%{user_name} uppdaterade resultatet %{resource_name} i %{space_name}"
+        status:
+          create: "%{user_name} skapade statusen %{resource_name}"
+          delete: "%{user_name} raderade statusen %{resource_name}"
+          update: "%{user_name} uppdaterade statusen %{resource_name}"
         value_types:
           parent_presenter:
             not_found: 'Föräldraposten hittades inte i databasen (ID: %{id})'

data/config/locales/sw-KE.yml

@@ -1,2 +1 @@
----
 sw:

data/config/locales/ti-ER.yml

@@ -1,2 +1 @@
----
 ti:

data/config/locales/val-ES.yml

@@ -1,2 +1 @@
----
 val:

data/config/locales/vi.yml

@@ -1,2 +1 @@
----
 vi:

data/config/locales/zh-TW.yml

@@ -1,2 +1 @@
----
 zh-TW:

data/lib/decidim/accountability/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.27.0.rc1"
+      "0.27.0.rc2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.27.0.rc1
+  version: 0.27.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,126 +18,126 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.0.rc1
+        version: 0.27.0.rc2
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com