decidim-accountability 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dabc78ed0d6f7c560ca2065878a4d67c1f1d097012ff784395a9086f8802f5e
-  data.tar.gz: 52a15c467053ed505103371bc23650f1c29b6fa8f312ce9b0686ee1c6846b9bc
+  metadata.gz: 6b5a897910fb650fdf93a9331332d1d25f6f5493fa28e31aa91dab08e198a708
+  data.tar.gz: 44e31bda483a1dd1f0bf54f5227c3865a2ee40f9264350bb438182701bcb83fd
 SHA512:
-  metadata.gz: 35738d247310c5d74a211f84f3d68cb8e1060a990ad5ffa0b77890ff01ee72895ab6ee3376a824444a0dfe1d0c1df597096751b4228acdd9cdf3a211555f4fbb
-  data.tar.gz: 3034823fb109927ed38aa130411f5bd18f4379e521935f3ced5f8587e50c9c58792f89e34ca241556268a368fb87be8b760ed2355852553d4a6ffa17a4cb5470
+  metadata.gz: 2273649a919372ce316bbe1c36cb001e1897c23eed728a9ef6d588d63af58f1f1e632bbf6177216d31651a8c3e6f8fc1b0bca278152b3ca27b4cb7f9457ddf10
+  data.tar.gz: 2e5495c60f9fb2caa7e222a37a47a6f0b3c6d9f992424c223aaa70b95de6910610665f92b55ca232c71613bcbb0cd67c710aee2075620c24b5046d5fb117efff

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.description %>

data/config/locales/hu.yml

@@ -4,7 +4,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
@@ -94,7 +94,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
@@ -109,7 +109,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
@@ -170,7 +170,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 +225,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 +243,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/lt.yml

@@ -180,6 +180,8 @@ lt:
           subcategories_label: Subkategorijos
         home_header:
           global_status: Bendra vykdymo būsena
+        nav_breadcrumb:
+          global: Bendras vykdymas
         search:
           search: Ieškoti veiksmų
         show:

data/config/locales/nl.yml

@@ -49,6 +49,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:

data/config/locales/no.yml

@@ -61,10 +61,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

data/config/locales/oc-FR.yml

@@ -0,0 +1 @@
+oc:

data/lib/decidim/accountability/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-09-29 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.26.2
+        version: 0.26.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.26.3
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -306,6 +306,7 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml