decidim-initiatives 0.29.1 → 0.29.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66cadff3b0a6f7bee1799cf2a45a75473996a85a9044342f67c00de3e5d3fc02
-  data.tar.gz: 1afa0ba7da9298837a5b0446b5cb694a84ace63dfc05e79c3b84f467ab87bffd
+  metadata.gz: 7028e4fbfecf3ec54aac09aefa519f5c22bb0e3030516b919762c7b9234dd9a4
+  data.tar.gz: 50c490f2d3facfce3580851d6bcf9a30875f884bc892d6a83cbf3329e44130fd
 SHA512:
-  metadata.gz: 11e7100d9c3befb0dd83ebc3a103616153d59058af98d55915e47c8789e41033842c97461baa7be9c196e926e815e1d7816f68483f85b04be13b9d4cbbb14cab
-  data.tar.gz: a5bfa283cdcae83076bceddf1c4dee645ba79d288f8b2fb4e9fae315575c4c0f4ec5628e90016d921f968857396081ef6bd9785d79be2336747f78a20f13fbaa
+  metadata.gz: 9c92329e9a6e21d786fb4ce25ec6b5451fb7e3cf00a948a3439699487a63feec9f60d8bf47c2f313dad005855d2a3ad4b7bd43d445b5c55489c3f3a8e69f6bd2
+  data.tar.gz: 8867a36b647ad181909b503b58282600874c0ceb509f6e17450aecba149b8fbc72128ec8db089ed0cb70f879927fe229817dd4c969ff1d18b195b47c3420ff7a

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -86,7 +86,7 @@ module Decidim
       end
 
       def scoped_type
-        InitiativesTypeScope.order(:id).find_by(type: form.type)
+        InitiativesTypeScope.order(:id).find_by(type: form.type, scope: form.scope)
       end
 
       def signature_end_date

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -107,7 +107,7 @@ module Decidim
       end
 
       def print
-        enforce_permission_to :read, :initiative, initiative: current_initiative
+        enforce_permission_to :print, :initiative, initiative: current_initiative
       end
 
       private

data/app/forms/decidim/initiatives/admin/initiative_answer_form.rb

@@ -10,7 +10,7 @@ module Decidim
 
         mimic :initiative
 
-        translatable_attribute :answer, String
+        translatable_attribute :answer, Decidim::Attributes::RichText
         attribute :answer_url, String
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -11,7 +11,7 @@ module Decidim
         mimic :initiative
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         attribute :type_id, Integer
         attribute :decidim_scope_id, Integer
         attribute :area_id, Integer

data/app/forms/decidim/initiatives/admin/initiative_type_form.rb

@@ -12,7 +12,7 @@ module Decidim
         mimic :initiatives_type
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         attribute :banner_image
         attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
@@ -25,7 +25,7 @@ module Decidim
         attribute :promoting_committee_enabled, Boolean
         attribute :minimum_committee_members, Integer
         attribute :collect_user_extra_fields, Boolean
-        translatable_attribute :extra_fields_legal_information, String
+        translatable_attribute :extra_fields_legal_information, Decidim::Attributes::RichText
         attribute :validate_sms_code_on_votes, Boolean
         attribute :document_number_authorization_handler, String
 

data/app/models/decidim/initiative.rb

@@ -24,6 +24,7 @@ module Decidim
     include Decidim::HasResourcePermission
     include Decidim::HasArea
     include Decidim::FilterableResource
+    include Decidim::Reportable
 
     translatable_fields :title, :description, :answer
 
@@ -212,6 +213,11 @@ module Decidim
       user_group&.name || author.name
     end
 
+    # Public: Overrides the `reported_attributes` Reportable concern method.
+    def reported_attributes
+      [:title, :description]
+    end
+
     def votes_enabled?
       published? &&
         signature_start_date <= Date.current &&

data/app/packs/entrypoints/decidim_initiatives_admin.js

@@ -1,3 +1,5 @@
 import "src/decidim/initiatives/admin/initiatives_types"
 import "src/decidim/initiatives/admin/invite_users"
 import "src/decidim/initiatives/scoped_type"
+
+import "entrypoints/decidim_initiatives_admin.scss"

data/app/packs/entrypoints/decidim_initiatives_admin.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/initiatives/admin/initiatives.scss";

data/app/packs/stylesheets/decidim/initiatives/admin/initiatives.scss

@@ -0,0 +1,13 @@
+#committee_members {
+  .card-section {
+    .row {
+      div[data-committee_link] {
+        @apply flex items-center;
+
+        svg {
+          @apply mx-1;
+        }
+      }
+    }
+  }
+}

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

@@ -134,8 +134,8 @@ module Decidim
           return unless permission_action.subject == :initiative
 
           case permission_action.action
-          when :read
-            toggle_allow(Decidim::Initiatives.print_enabled)
+          when :print
+            toggle_allow(Decidim::Initiatives.print_enabled && user.admin?)
           when :publish, :discard
             toggle_allow(initiative.validating?)
           when :unpublish

data/app/permissions/decidim/initiatives/permissions.rb

@@ -4,6 +4,8 @@ module Decidim
   module Initiatives
     class Permissions < Decidim::DefaultPermissions
       def permissions
+        return permission_action if initiative && !initiative.is_a?(Decidim::Initiative)
+
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Initiatives::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
@@ -19,6 +21,7 @@ module Decidim
         create_initiative?
         edit_public_initiative?
         update_public_initiative?
+        print_initiative?
 
         vote_initiative?
         sign_initiative?
@@ -121,6 +124,17 @@ module Decidim
         )
       end
 
+      def print_initiative?
+        return unless permission_action.action == :print &&
+                      permission_action.subject == :initiative
+
+        toggle_allow(Decidim::Initiatives.print_enabled && (authorship_or_admin? || committee_member?))
+      end
+
+      def committee_member?
+        InitiativesPromoted.by(user).exists?(id: initiative.id)
+      end
+
       def vote_initiative?
         return unless permission_action.action == :vote &&
                       permission_action.subject == :initiative

data/app/views/decidim/initiatives/admin/committee_requests/index.html.erb

@@ -56,4 +56,5 @@
   </table>
 </div>
 
+<%= append_stylesheet_pack_tag "decidim_initiatives_admin" %>
 <%= append_javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/admin/initiatives/index.html.erb

@@ -60,7 +60,7 @@
                 <%= icon "chat-1-line", scope: "decidim.admin", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
               <% end %>
 
-              <% if allowed_to? :read, :initiative, initiative: initiative %>
+              <% if allowed_to? :print, :initiative, initiative: initiative %>
                 <%= icon_link_to "printer-line",
                                  decidim_initiatives.print_initiative_path(initiative),
                                  t(".print"),

data/config/initializers/wicked_pdf.rb

@@ -15,7 +15,6 @@ WickedPdf.configure do |config|
   # one of the wkhtmltopdf-binary family of gems.
   #   or
   # config.exe_path = '/usr/local/bin/wkhtmltopdf',
-  config.exe_path = Gem.bin_path("wkhtmltopdf-binary", "wkhtmltopdf")
 
   # Layout file to be used for all PDFs
   # (but can be overridden in `render :pdf` calls)

data/config/locales/ar.yml

@@ -97,6 +97,7 @@ ar:
             initiative_title: عنوان المبادرة
             name_and_surname: اسم ولقب
             postal_code: الكود البريدى
+            scope: نطاق
             time_and_date: الوقت و التاريخ
             timestamp: الطابع الزمني
       titles:
@@ -314,6 +315,7 @@ ar:
           full_name: الاسم الكامل
           initiative:
             description: 'الوصف:'
+          print: طباعة
         result:
           initiative_rejected_reason: تم رفض هذه المبادرة بسبب افتقارها للتوقيعات.
         signatures_count:
@@ -358,8 +360,12 @@ ar:
     menu:
       initiatives: المبادرات
     resources:
+      initiative:
+        actions:
+          comment: تعليق
       initiatives_type:
         actions:
+          create: إنشاء
           title: أفعال
           vote: إشارة
   layouts:

data/config/locales/bg.yml

@@ -362,7 +362,6 @@ bg:
         finish:
           back: Назад
           back_to_initiatives: Назад към инициативите
-          callout_text: Поздравления! Гражданската Ви инициатива беше създадена успешно.
           confirm: Ще изпратите инициативата на администратор да я прегледа и публикува. След публикуване няма да можете да го редактирате. Сигурен ли си?
           edit_my_initiative: Редактиране на моята инициатива
           go_to_my_initiatives: Към моите инициативи

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1 @@
+bs: