decidim-sortitions 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1ef23ed70e331643ec97f813391b6741104b87fc343866b8398e036a9e82c96
-  data.tar.gz: 57dbadaf6345196c746ca77af4427128af3bdb807a6f08caa403b9e1093cbd7e
+  metadata.gz: 2072e34e4976e77facfc3467d970c431218b6b6f7cc61d0cbdabc63b6a1bc0d2
+  data.tar.gz: 3a18c0e5d4ee513109409fc85f4cd38092f81e1ef73f1f6d056034b202ed0f07
 SHA512:
-  metadata.gz: 9dac3b56666a789eb8ab8f5e8e1d6e048b8bb0f5263568a10b6a0a627b62fc31b1800e9b1d431bfaf619180f497c2d4d11648e8628d604cceefd62389348c237
-  data.tar.gz: '07609b63ea5d7bf93a134855dd61abb3a000e3cdd653c7fee4c8355a73de8f3eebced35059f0af2c08fd635949e3bc42e4f8f5e2cde4c14b5dd41beee4d75664'
+  metadata.gz: 217933b8292b8ea8be3b600ee059dbbab9a11e05cce58377ae0fd5135097fe900aee6b1c3f7a97cff7c18b4eede4852053feb22aaaeadb1a60f7b14c9a238d02
+  data.tar.gz: cc3eb7c079941f66df0e3ef077a59678120bbb44280236bd78a2108cd2daf11675b6a0b910fa36b552d6173f4dbbbf0edf9e63452f510dbcc2ce1f6fccc35b74

data/app/cells/decidim/sortitions/sortition_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Sortitions
+    # This cell renders the card for an instance of a Sortition
+    # the default size is the Medium Card (:m)
+    class SortitionCell < Decidim::ViewModel
+      def show
+        cell card_size, model, @options
+      end
+
+      private
+
+      def card_size
+        "decidim/sortitions/sortition_m"
+      end
+    end
+  end
+end

data/app/cells/decidim/sortitions/sortition_m/data.erb

@@ -0,0 +1,15 @@
+<div class="card__icondata">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <%= icon "random-seed", class: "icon--big" %>
+    </li>
+    <li class="card-data__item">
+      <div class="text-left text-uppercase">
+        <strong class="heading4">
+          <%= model.seed %>
+        </strong>
+        &nbsp;<small><%= t("decidim.sortitions.sortitions.sortition.random_seed") %></small>
+      </div>
+    </li>
+  </ul>
+</div>

data/app/cells/decidim/sortitions/sortition_m/footer.erb

@@ -0,0 +1,13 @@
+<div class="card__footer">
+  <div class="card__support">
+    <div class="text-uppercase">
+      <strong class="text-large">
+        <%= proposals_count %>
+      </strong>
+      <small class="text-medium">
+        <%= t("decidim.sortitions.sortitions.sortition.selected_proposals", count: proposals_count) %>
+      </small>
+    </div>
+    <%= link_to t("decidim.sortitions.sortitions.sortition.view"), resource_path, class: "card__button button--sc button small secondary light" %>
+  </div>
+</div>

data/app/cells/decidim/sortitions/sortition_m_cell.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Sortitions
+    # This cell renders a sortition with its M-size card.
+    class SortitionMCell < Decidim::CardMCell
+      include Decidim::Sortitions::Engine.routes.url_helpers
+
+      private
+
+      def has_author?
+        false
+      end
+
+      def has_state?
+        true
+      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
+        return t("filters.cancelled", scope: "decidim.sortitions.sortitions") if model.cancelled?
+        t("filters.active", scope: "decidim.sortitions.sortitions")
+      end
+
+      def state_classes
+        return ["muted"] if model.cancelled?
+        ["success"]
+      end
+
+      def proposals_count
+        @proposals_count = model.proposals.count
+      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 = decidim_sanitize(translated_attribute(model.additional_info))
+        text.gsub!(/^<p>/, "<p>#{render :badge}")
+        html_truncate(text, length: 100)
+      end
+    end
+  end
+end

data/app/controllers/decidim/sortitions/admin/sortitions_controller.rb

@@ -11,16 +11,18 @@ module Decidim
         def index; end
 
         def show
-          authorize! :show, sortition
+          enforce_permission_to :read, :sortition, sortition: sortition
         end
 
         def edit
-          authorize! :update, sortition
+          enforce_permission_to :update, :sortition, sortition: sortition
+
           @form = edit_sortition_form.from_model(sortition, current_participatory_space: current_participatory_space)
         end
 
         def update
-          authorize! :update, sortition
+          enforce_permission_to :update, :sortition, sortition: sortition
+
           @form = edit_sortition_form.from_params(params, current_participatory_space: current_participatory_space)
           UpdateSortition.call(@form) do
             on(:ok) do |_sortition|
@@ -36,12 +38,14 @@ module Decidim
         end
 
         def new
-          authorize! :create, Sortition
+          enforce_permission_to :create, :sortition
+
           @form = sortition_form.instance(current_participatory_space: current_participatory_space)
         end
 
         def create
-          authorize! :create, Sortition
+          enforce_permission_to :create, :sortition
+
           @form = sortition_form.from_params(params, current_participatory_space: current_participatory_space)
           CreateSortition.call(@form) do
             on(:ok) do |sortition|
@@ -57,12 +61,14 @@ module Decidim
         end
 
         def confirm_destroy
-          authorize! :destroy, sortition
+          enforce_permission_to :destroy, :sortition, sortition: sortition
+
           @form = destroy_sortition_form.from_model(sortition, current_participatory_space: current_participatory_space)
         end
 
         def destroy
-          authorize! :destroy, sortition
+          enforce_permission_to :destroy, :sortition, sortition: sortition
+
           @form = destroy_sortition_form.from_params(params, current_participatory_space: current_participatory_space)
           DestroySortition.call(@form) do
             on(:ok) do |_sortition|
@@ -94,10 +100,6 @@ module Decidim
         def proposal_components
           ParticipatorySpaceProposalComponents.for(current_participatory_space)
         end
-
-        def ability_context
-          super.merge(current_participatory_space: current_participatory_space)
-        end
       end
     end
   end

data/app/models/decidim/sortitions/sortition.rb

@@ -79,7 +79,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
     end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Sortitions
+    module Admin
+      class Permissions < Decidim::DefaultPermissions
+        def permissions
+          return permission_action unless user
+
+          return permission_action if permission_action.scope != :admin
+
+          return permission_action if permission_action.subject != :sortition
+
+          case permission_action.action
+          when :destroy
+            permission_action.allow! if sortition.present? && !sortition.cancelled?
+          when :update
+            permission_action.allow! if sortition.present?
+          when :create, :read
+            permission_action.allow!
+          end
+
+          permission_action
+        end
+
+        private
+
+        def sortition
+          @sortition ||= context.fetch(:sortition, nil)
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/sortitions/permissions.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Sortitions
+    class Permissions < Decidim::DefaultPermissions
+      def permissions
+        return permission_action unless user
+
+        return Decidim::Sortitions::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
+
+        permission_action
+      end
+    end
+  end
+end

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

@@ -3,8 +3,8 @@
     <h2 class="card-title">
       <%= t(".title") %>
       <div class="button--title">
-        <% if can? :create, Decidim::Sortitions::Sortition %>
-          <%= link_to t("actions.new", scope: "decidim.sortitions.admin", name: t("models.sortition.name", scope: "decidim.sortitions.admin")), new_sortition_path, class: "button tiny button--simple" if can? :manage, current_component %>
+        <% if allowed_to? :create, :sortition %>
+          <%= link_to t("actions.new", scope: "decidim.sortitions.admin", name: t("models.sortition.name", scope: "decidim.sortitions.admin")), new_sortition_path, class: "button tiny button--simple" %>
         <% end %>
       </div>
     </h2>
@@ -33,14 +33,14 @@
                                t("actions.show", scope: "decidim.sortitions.admin"),
                                class: "action-icon--preview" %>
 
-              <% if can? :destroy, sortition %>
+              <% if allowed_to? :update, :sortition, sortition: sortition %>
                 <%= icon_link_to "pencil",
                                 edit_sortition_path(sortition),
                                 t("actions.edit", scope: "decidim.sortitions.admin"),
                                 class: "action-icon--edit" %>
              <% end %>
 
-              <% if can? :destroy, sortition %>
+              <% if allowed_to? :destroy, :sortition, sortition: sortition %>
                 <%= icon_link_to "circle-x",
                                  confirm_destroy_sortition_path(sortition),
                                  t("actions.destroy", scope: "decidim.sortitions.admin"),

data/app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb

@@ -1,6 +1,5 @@
 <div class="card card--action card--list">
   <% resources.each do |sortition| %>
-    <% next unless sortition.component.published? %>
     <div class="card--list__item">
       <div class="card--list__text">
         <%= link_to resource_locator(sortition).path do %>

data/app/views/decidim/sortitions/sortitions/_proposal.html.erb

@@ -1,24 +1 @@
-<div class="column">
-  <article class="card card--proposal">
-    <div class="card__content">
-      <div class="card__header">
-        <%= link_to proposal_path(proposal) do %>
-          <h5 class="card__title"><%= proposal.title %></h5>
-        <% end %>
-        <div class="card__author author-data author-data--small">
-          <%= render partial: "decidim/shared/author_reference", locals: { author: present(proposal).author } %>
-        </div>
-        <%= resource_reference(proposal, class: "reference--text-left") %>
-      </div>
-      <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
-      <p><%= truncate(proposal.body, length: 100) %></p>
-      <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <div class="card__support__data"></div>
-        <%= link_to t(".view_proposal"), proposal_path(proposal), class: "card__button button small secondary" %>
-      </div>
-    </div>
-  </article>
-</div>
+<%= card_for proposal %>

data/app/views/decidim/sortitions/sortitions/_sortition.html.erb

@@ -1,25 +1 @@
-<div class="column">
-  <article class="card card--sortition">
-    <div class="card__content">
-      <div class="card__header">
-        <%= link_to sortition do %>
-          <h5 class="card__title"><%= translated_attribute sortition.title %></h5>
-        <% end %>
-        <div class="card__author author-data author-data--small">
-          <%= render partial: "sortition_author", locals: { sortition: sortition } %>
-        </div>
-        <%= resource_reference(sortition, class: "reference--text-left") %>
-      </div>
-      <p class="card__desc">
-        <%= decidim_sanitize html_truncate(translated_attribute(sortition.additional_info), length: 100, separator: "...") %>
-      </p>
-      <%= render partial: "tags", locals: { sortition: sortition } %>
-    </div>
-    <div class="card__footer">
-      <div class="card__support">
-        <div class="card__support__data"><%= t ".selected_proposals", count: sortition.selected_proposals.count %></div>
-        <%= link_to t(".view_sortition"), sortition, class: "card__button button small secondary" %>
-      </div>
-    </div>
-  </article>
-</div>
+<%= card_for sortition %>

data/app/views/decidim/sortitions/sortitions/show.html.erb

@@ -70,7 +70,7 @@
     </div>
     <div class="row">
       <div id="proposals" class="columns mediumlarge-12 large-12">
-        <div class="row small-up-1 medium-up-2 card-grid">
+        <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
           <%= render partial: "proposal", collection: sortition.proposals %>
         </div>
       </div>

data/config/locales/ca.yml

@@ -5,10 +5,17 @@ ca:
         additional_info: Informació sobre el sorteig
         decidim_category_id: Categories del conjunt de propostes en què voleu aplicar el sorteig
         decidim_proposals_component_id: Propostes establertes
-        dice: Resultat de la tirada de daus (tira un dau de sis cares o busca alguna altra manera de generar un número de 1 a 6) i introdueix-lo aquí, a diferència de ser testimoni del resultat. Això contribueix en la qualitat de l'aleatorietat
+        dice: Resultat de la tirada de daus. Tira un dau de sis cares o busca alguna altra manera de generar un número de 1 a 6 i introdueix-lo aquí, a diferència de ser testimoni del resultat. Això contribueix en la qualitat de l'aleatorietat
         target_items: Nombre de propostes a seleccionar (indica el nombre de propostes que voleu seleccionar mitjançant el sorteig del grup de propostes que hàgiu triat prèviament)
         title: Títol
         witnesses: Testimonis
+    models:
+      decidim/sortitions/create_sortition_event: Sorteig
+  activerecord:
+    models:
+      decidim/sortitions/sortition:
+        one: Sorteig
+        other: Sortejos
   decidim:
     components:
       sortitions:
@@ -23,6 +30,10 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
           email_subject: S'ha afegit un nou sorteig a %{participatory_space_title}
           notification_title: El sorteig <a href="%{resource_path}">%{resource_title}</a> s'ha afegit a %{participatory_space_title}
+    pages:
+      home:
+        statistics:
+          sortitions_count: Sortejos
     participatory_processes:
       statistics:
         sortitions_count: Sortejos
@@ -106,8 +117,6 @@ ca:
           label: 'Ordeneu els sortejos per:'
           random: Aleatori
           recent: Recent
-        proposal:
-          view_proposal: Veure proposta
         results_count:
           count:
             one: proposta seleccionada
@@ -127,10 +136,11 @@ ca:
           time_seed: "(2) Llavor de temps"
           witnesses: Testimonis
         sortition:
+          random_seed: Llavor aleatòria
           selected_proposals:
             one: 1 proposta seleccionada
-            other: "%{count} propostes seleccionades"
-          view_sortition: Mostra el sorteig
+            other: '%{count} propostes seleccionades'
+          view: Veure
         sortition_author:
           deleted: Usuari eliminat
         sortition_cancel_author:
@@ -139,7 +149,3 @@ ca:
           count:
             one: 1 sorteig
             other: "%{count} classificacions"
-  pages:
-    home:
-      statistics:
-        sortitions_count: Sortejos

data/config/locales/en.yml

@@ -6,10 +6,17 @@ en:
         additional_info: Sortition information
         decidim_category_id: Categories of the set of proposals in which you want to apply the draw
         decidim_proposals_component_id: Proposals set
-        dice: Result of die roll (roll a 6-sided die (or look for another random way to generate a number from 1 to 6) and enter here, as opposed to witness the resulting number, this contributes to the quality and guarantees of the randomness of the result
+        dice: Result of die roll. Roll a 6-sided die, or look for another random way to generate a number from 1 to 6, and enter here the resulting number in front of some witnesses. This contributes to the quality and guarantees of the randomness of the result
         target_items: Number of proposals to be selected (indicates the number of proposals you want to be selected by drawing lots of the group of proposals you have previously chosen)
         title: Title
         witnesses: Witnesses
+    models:
+      decidim/sortitions/create_sortition_event: Sortition
+  activerecord:
+    models:
+      decidim/sortitions/sortition:
+        one: Sortition
+        other: Sortitions
   decidim:
     components:
       sortitions:
@@ -24,6 +31,10 @@ en:
           email_outro: You have received this notification because you are following "%{participatory_space_title}". You can unfollow it from the previous link.
           email_subject: New sortition added to %{participatory_space_title}
           notification_title: The sortition <a href="%{resource_path}">%{resource_title}</a> has been added to %{participatory_space_title}
+    pages:
+      home:
+        statistics:
+          sortitions_count: Sortitions
     participatory_processes:
       statistics:
         sortitions_count: Sortitions
@@ -77,7 +88,7 @@ en:
             selected_proposals: Proposals selected for draw
           update:
             error: There was an error updating the sortition.
-            success: Sortition successfully update
+            success: Sortition successfully updated
       admin_log:
         sortition:
           create: "%{user_name} created the %{resource_name} sortition in %{space_name}"
@@ -107,8 +118,6 @@ en:
           label: 'Order sortitions by:'
           random: Random
           recent: Recent
-        proposal:
-          view_proposal: View proposal
         results_count:
           count:
             one: selected proposal
@@ -132,10 +141,11 @@ en:
           time_seed: "(2) Time seed"
           witnesses: Witnesses
         sortition:
+          random_seed: Random seed
           selected_proposals:
-            one: 1 proposal selected
-            other: "%{count} proposals selected"
-          view_sortition: View sortition
+            one: proposal selected
+            other: proposals selected
+          view: View
         sortition_author:
           deleted: Deleted user
         sortition_cancel_author:
@@ -144,7 +154,3 @@ en:
           count:
             one: 1 sortition
             other: "%{count} sortitions"
-  pages:
-    home:
-      statistics:
-        sortitions_count: Sortitions