decidim-consultations 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bad111d183bccf422a02c44878021f13c1b0d06dd3f3233b7bd4e8d25b24b86e
-  data.tar.gz: 2c4096ea70122f163d3e5f483495cb411e4963078a5d83093f49bd05db281773
+  metadata.gz: 3687d66f875124321caae8e824709f4dc8e1b47e2b71751f594030b9eac70cb1
+  data.tar.gz: 5c5e9fc8a1eff2165b2052f6b77975e0ed4d7759035459a1debe70345ed51a78
 SHA512:
-  metadata.gz: bf2d6b42f9f811079d20bd53dd89da6c73242f904efcdb23862370fd7e6e21abf6d3c2acf795d931bbe41576c907f1e220f82379476304c3eab0199997db43e5
-  data.tar.gz: 45850fce78c8fff1feb3f528f1c6f481e252e645288d6c404e115465ebea6bf9748770afcd94cb8027fe2113f55e446ef4fa90e6132338f1589575ebd685d9e7
+  metadata.gz: a23c8a387de98f21298702fd69b07a72c25b373669f93dea76709db4a8eae9e6d0abc40e9abc967da54a2ed2ed9098373e27ce2a4cee9fad8e6759d43cf5f4de
+  data.tar.gz: b76ca509bc411841972fdb39f80e58ac54cd32b742c341398b63c998ec25aec609dc918a1c6fa3841dc8d20faeaab74de78570bd943f9139ce5e81499b4b1ef1

data/app/assets/config/decidim_consultations_manifest.css

@@ -0,0 +1,4 @@
+/*
+ *= link decidim/consultations/social_share.css.scss
+ *= link decidim/consultations/highlighted-content-banner.css.scss
+ */

data/app/assets/stylesheets/decidim/consultations/consultations.scss

@@ -1,4 +1,3 @@
-@import "decidim/_decidim";
 @import "question";
 @import "video_wrapper";
 @import "stats";

data/app/cells/decidim/consultations/consultation_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    # This cell renders the card for an instance of a Question
+    # the default size is the Medium Card (:m)
+    class ConsultationCell < Decidim::ViewModel
+      def show
+        cell card_size, model
+      end
+
+      private
+
+      def card_size
+        "decidim/consultations/consultation_m"
+      end
+    end
+  end
+end

data/app/cells/decidim/consultations/consultation_m/data.erb

@@ -0,0 +1,21 @@
+<div class="card__icondata">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <%= icon "datetime", class: "icon--big" %>
+    </li>
+    <li class="card-data__item">
+      <div class="card-data__item--centerblock">
+        <strong><%= t("activemodel.attributes.consultation.start_voting_date") %></strong>
+        <br />
+        <%= start_date ? l(start_date, format: :decidim_short) : t("decidim.consultations.show.unspecified") %>
+      </div>
+    </li>
+    <li class="card-data__item">
+      <div class="card-data__item--centerblock">
+        <strong><%= t("activemodel.attributes.consultation.end_voting_date") %></strong>
+        <br />
+        <%= end_date ? l(end_date, format: :decidim_short) : t("decidim.consultations.show.unspecified") %>
+      </div>
+    </li>
+  </ul>
+</div>

data/app/cells/decidim/consultations/consultation_m/footer.erb

@@ -0,0 +1,5 @@
+<div class="card__footer card__footer--spaces">
+  <div class="card__support">
+    <%= link_to t(footer_button_text, scope: "decidim.consultations.show.footer_button_text"), resource_path, class: "card__button button--sc light button small secondary" %>
+  </div>
+</div>

data/app/cells/decidim/consultations/consultation_m_cell.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Consultations
+    # This cell renders the Medium (:m) question card
+    # for an given instance of a Question
+    class ConsultationMCell < Decidim::CardMCell
+      private
+
+      def has_state?
+        true
+      end
+
+      def state_classes
+        state_data[:state_classes]
+      end
+
+      # Even though we need to render the badge, we can't do it in the normal
+      # way, because the paragraph comes from a user input and contains HTML.
+      # This causes the badge and the paragraph to appear in different lines.
+      # In order to fix it, check the `description` method.
+      def has_badge?
+        false
+      end
+
+      def badge_name
+        text = state_data[:badge_name]
+        return unless text
+
+        I18n.t(text, scope: "decidim.consultations.show.badge_name")
+      end
+
+      # In order to render the badge inline with the paragraph text we need to
+      # find the opening `<p>` tag and include the badge right after it. This
+      # makes the layout look good.
+      def description
+        text = super
+        text.gsub!(/^<p>/, "<p>#{render :badge}")
+        html_truncate(text, length: 100)
+      end
+
+      def resource_path
+        Decidim::Consultations::Engine.routes.url_helpers.consultation_path(model)
+      end
+
+      def resource_image_path
+        model.banner_image.url
+      end
+
+      def has_image?
+        true
+      end
+
+      def start_date
+        model.start_voting_date
+      end
+
+      def end_date
+        model.end_voting_date
+      end
+
+      def statuses
+        super << :questions_count
+      end
+
+      def questions_count_status
+        content_tag(
+          :strong,
+          t("activemodel.attributes.consultation.questions")
+        ) + " " + model.questions.count.to_s
+      end
+
+      def footer_button_text
+        state_data[:button_text]
+      end
+
+      # Internal: Calculates and caches the data related to the state of the
+      # current consultation.
+      def state_data
+        @state_data ||= if model.active?
+                          { state: :active, badge_name: "open_votes", state_classes: ["success"], button_text: "vote" }
+                        elsif model.upcoming?
+                          { state: :upcoming, badge_name: "open", state_classes: ["warning"], button_text: "debate" }
+                        elsif model.finished?
+                          { state: :finished, badge_name: "finished", state_classes: ["muted"], button_text: "view" }
+                        elsif model.published_results?
+                          { state: :published_results, badge_name: "published_results", state_classes: ["muted"], button_text: "view_results" }
+                        else
+                          { state: :undefined, badge_name: nil, state_classes: ["muted"], button_text: "view" }
+                        end
+      end
+    end
+  end
+end

data/app/commands/decidim/consultations/admin/update_consultation.rb

@@ -55,7 +55,8 @@ module Decidim
             introductory_video_url: form.introductory_video_url,
             start_voting_date: form.start_voting_date,
             end_voting_date: form.end_voting_date,
-            introductory_image: form.introductory_image
+            introductory_image: form.introductory_image,
+            remove_introductory_image: form.remove_introductory_image
           }
         end
       end

data/app/controllers/concerns/decidim/consultations/action_authorization.rb

@@ -16,8 +16,8 @@ module Decidim
       # action_name - The action to authorize against.
       #
       # Returns an AuthorizationStatus
-      def action_authorization(action_name)
-        return AuthorizationStatus.new(:ok) if can?(action_name.to_sym, Question)
+      def action_authorization(action_name, question = current_question)
+        return AuthorizationStatus.new(:ok) if allowed_to?(action_name.to_sym, :question, question: question)
 
         AuthorizationStatus.new(:denied)
       end

data/app/controllers/concerns/decidim/consultations/admin/consultation_admin.rb

@@ -17,6 +17,13 @@ module Decidim
           layout "decidim/admin/consultation"
 
           alias_method :current_participatory_space, :current_consultation
+
+          def permission_class_chain
+            [
+              Decidim::Consultations::Permissions,
+              Decidim::Admin::Permissions
+            ]
+          end
         end
       end
     end

data/app/controllers/concerns/decidim/consultations/admin/question_admin.rb

@@ -21,6 +21,13 @@ module Decidim
             return current_consultation if params.has_key? :consultation_slug
             current_question
           end
+
+          def permission_class_chain
+            [
+              Decidim::Consultations::Permissions,
+              Decidim::Admin::Permissions
+            ]
+          end
         end
       end
     end

data/app/controllers/concerns/decidim/consultations/needs_consultation.rb

@@ -36,10 +36,6 @@ module Decidim
 
         private
 
-        def ability_context
-          super.merge(current_consultation: current_consultation)
-        end
-
         def detect_consultation
           request.env["current_consultation"] ||
             organization_consultations.find_by(slug: params[:consultation_slug] || params[:slug])

data/app/controllers/concerns/decidim/consultations/needs_question.rb

@@ -49,13 +49,6 @@ module Decidim
 
         private
 
-        def ability_context
-          super.merge(
-            current_question: current_question,
-            current_consultation: current_consultation
-          )
-        end
-
         def detect_question
           request.env["current_question"] ||
             OrganizationQuestions.for(current_organization).find_by(slug: params[:question_slug] || params[:slug])

data/app/controllers/decidim/consultations/admin/application_controller.rb

@@ -8,6 +8,21 @@ module Decidim
         layout "decidim/admin/consultations"
 
         helper Decidim::SanitizeHelper
+
+        include NeedsPermission
+
+        private
+
+        def permission_class_chain
+          [
+            Decidim::Consultations::Permissions,
+            Decidim::Admin::Permissions
+          ]
+        end
+
+        def permission_scope
+          :admin
+        end
       end
     end
   end

data/app/controllers/decidim/consultations/admin/consultation_publications_controller.rb

@@ -4,11 +4,11 @@ module Decidim
   module Consultations
     module Admin
       # Controller that allows managing consultation publications.
-      class ConsultationPublicationsController < Decidim::Admin::ApplicationController
+      class ConsultationPublicationsController < Decidim::Consultations::Admin::ApplicationController
         include ConsultationAdmin
 
         def create
-          authorize! :publish, current_consultation
+          enforce_permission_to :publish, :consultation, consultation: current_consultation
 
           PublishConsultation.call(current_consultation) do
             on(:ok) do
@@ -24,7 +24,7 @@ module Decidim
         end
 
         def destroy
-          authorize! :publish, current_consultation
+          enforce_permission_to :publish, :consultation, consultation: current_consultation
 
           UnpublishConsultation.call(current_consultation) do
             on(:ok) do

data/app/controllers/decidim/consultations/admin/consultation_results_publications_controller.rb

@@ -4,11 +4,11 @@ module Decidim
   module Consultations
     module Admin
       # Controller that allows managing consultation result publications.
-      class ConsultationResultsPublicationsController < Decidim::Admin::ApplicationController
+      class ConsultationResultsPublicationsController < Decidim::Consultations::Admin::ApplicationController
         include ConsultationAdmin
 
         def create
-          authorize! :publish_results, current_consultation
+          enforce_permission_to :publish_results, :consultation, consultation: current_consultation
 
           PublishConsultationResults.call(current_consultation) do
             on(:ok) do
@@ -24,7 +24,7 @@ module Decidim
         end
 
         def destroy
-          authorize! :unpublish_Results, current_consultation
+          enforce_permission_to :unpublish_results, :consultation, consultation: current_consultation
 
           UnpublishConsultationResults.call(current_consultation) do
             on(:ok) do

data/app/controllers/decidim/consultations/admin/consultations_controller.rb

@@ -9,19 +9,19 @@ module Decidim
 
         # GET /admin/consultations
         def index
-          authorize! :index, Decidim::Consultation
+          enforce_permission_to :read, :consultation
           @consultations = collection
         end
 
         # GET /admin/consultations/new
         def new
-          authorize! :new, Consultation
+          enforce_permission_to :create, :consultation
           @form = consultation_form.instance
         end
 
         # POST /admin/consultations
         def create
-          authorize! :create, Consultation
+          enforce_permission_to :create, :consultation
           @form = consultation_form.from_params(params)
 
           CreateConsultation.call(@form) do
@@ -39,14 +39,14 @@ module Decidim
 
         # GET /admin/consultations/:slug/edit
         def edit
-          authorize! :edit, current_consultation
+          enforce_permission_to :update, :consultation, consultation: current_consultation
           @form = consultation_form.from_model(current_consultation)
           render layout: "decidim/admin/consultation"
         end
 
         # PUT /admin/initiatives/:id
         def update
-          authorize! :update, current_consultation
+          enforce_permission_to :update, :consultation, consultation: current_consultation
 
           @form = consultation_form
                   .from_params(params.except(:slug), consultation_id: current_consultation.id)
@@ -65,7 +65,7 @@ module Decidim
         end
 
         def destroy
-          authorize! :destroy, current_consultation
+          enforce_permission_to :destroy, :consultation, consultation: current_consultation
           current_consultation.destroy!
 
           flash[:notice] = I18n.t("consultations.destroy.success", scope: "decidim.admin")
@@ -87,10 +87,6 @@ module Decidim
           @collection ||= OrganizationConsultations.new(current_user.organization).query
         end
 
-        def ability_context
-          super.merge(current_consultation: current_consultation)
-        end
-
         def consultation_form
           form(ConsultationForm)
         end

data/app/controllers/decidim/consultations/admin/question_attachments_controller.rb

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # Controller that allows managing all the attachments for a question
-      class QuestionAttachmentsController < Decidim::Admin::ApplicationController
+      class QuestionAttachmentsController < Decidim::Consultations::Admin::ApplicationController
         include QuestionAdmin
         include Decidim::Admin::Concerns::HasAttachments
 

data/app/controllers/decidim/consultations/admin/question_publications_controller.rb

@@ -4,11 +4,11 @@ module Decidim
   module Consultations
     module Admin
       # Controller that allows managing question publications.
-      class QuestionPublicationsController < Decidim::Admin::ApplicationController
+      class QuestionPublicationsController < Decidim::Consultations::Admin::ApplicationController
         include QuestionAdmin
 
         def create
-          authorize! :publish, current_question
+          enforce_permission_to :publish, :question, question: current_question
 
           PublishQuestion.call(current_question) do
             on(:ok) do
@@ -24,7 +24,7 @@ module Decidim
         end
 
         def destroy
-          authorize! :publish, current_question
+          enforce_permission_to :publish, :question, question: current_question
 
           UnpublishConsultation.call(current_question) do
             on(:ok) do

data/app/controllers/decidim/consultations/admin/questions_controller.rb

@@ -7,19 +7,19 @@ module Decidim
         include QuestionAdmin
 
         def index
-          authorize! :index, Decidim::Consultations::Question
+          enforce_permission_to :read, :question
           @questions = collection
           render layout: "decidim/admin/consultation"
         end
 
         def new
-          authorize! :new, Decidim::Consultations::Question
+          enforce_permission_to :create, :question
           @form = question_form.instance
           render layout: "decidim/admin/consultation"
         end
 
         def create
-          authorize! :create, Decidim::Consultations::Question
+          enforce_permission_to :create, :question
           @form = question_form.from_params(params, current_consultation: current_consultation)
 
           CreateQuestion.call(@form) do
@@ -36,13 +36,13 @@ module Decidim
         end
 
         def edit
-          authorize! :edit, current_question
+          enforce_permission_to :update, :question, question: current_question
           @form = question_form.from_model(current_question, current_consultation: current_consultation)
           render layout: "decidim/admin/question"
         end
 
         def update
-          authorize! :update, current_question
+          enforce_permission_to :update, :question, question: current_question
 
           @form = question_form
                   .from_params(params, question_id: current_question.id, current_consultation: current_consultation)
@@ -61,7 +61,7 @@ module Decidim
         end
 
         def destroy
-          authorize! :destroy, current_question
+          enforce_permission_to :destroy, :question, question: current_question
           current_question.destroy!
 
           flash[:notice] = I18n.t("questions.destroy.success", scope: "decidim.admin")
@@ -75,10 +75,6 @@ module Decidim
           @collection ||= current_consultation&.questions
         end
 
-        def ability_context
-          super.merge(current_consultation: current_consultation)
-        end
-
         def question_form
           form(QuestionForm)
         end