decidim-proposals 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656619a854b4e23c556abee9a2641287a8b0b9e4
-  data.tar.gz: fe25ef91ada0e02ce0c8a41b4155843b70de8049
+  metadata.gz: 4862d42b8a29f90463ba8384ac679cabdf2c3cd7
+  data.tar.gz: c29a9302b9eb23d34fd9d28ae7f2eef891b89f7d
 SHA512:
-  metadata.gz: efdb25720d97e47ce218640b118012b790755a30c13b8e1193a017e53763c8c261f5af140355c5a44864c1cf2b68dfe9ed8dc16e361e4409bea88cbc3a7d583a
-  data.tar.gz: 5b72de0eb3baba3c6430706cf7157ae7cdb459d3a2955af0fd5678dc42b58ca1a5ebc9b38e8b5a727473cd5300b3d4315704844fc12ce5de8221c8fabed46478
+  metadata.gz: 96bf31e33f24cb569e111789bbcd6d88a605f61b9ceaf050cc45f12e9af5595d967ccf66b97d62930b1a739c2bbea3b2de207db0e72ba437fb2a2b10e0cf652f
+  data.tar.gz: 96917d9a39b9b26301669f5b41583b1a884e02f63321552903bf62e6ffab32932da765e966bd678dfea1c41ccbc8840c49a6d4a2b71016b45fa8519a364d8ea2

data/app/commands/decidim/proposals/unvote_proposal.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user unvotes a proposal.
+    class UnvoteProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - A Decidim::Proposals::Proposal object.
+      # current_user - The current user.
+      def initialize(proposal, current_user)
+        @proposal = proposal
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        destroy_proposal_vote
+        broadcast(:ok, @proposal)
+      end
+
+      private
+
+      def destroy_proposal_vote
+        @proposal.votes.where(author: @current_user).destroy_all
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/vote_proposal.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user votes a proposal.
+    class VoteProposal < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - A Decidim::Proposals::Proposal object.
+      # current_user - The current user.
+      def initialize(proposal, current_user)
+        @proposal = proposal
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal vote.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        build_proposal_vote
+        return broadcast(:invalid) unless vote.valid?
+
+        vote.save!
+        broadcast(:ok, vote)
+      end
+
+      attr_reader :vote
+
+      private
+
+      def build_proposal_vote
+        @vote = @proposal.votes.build(author: @current_user)
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -22,23 +22,27 @@ module Decidim
         def available_orders
           @available_orders ||= begin
             available_orders = %w(random recent)
-            available_orders << "most_voted" if votes_visible?
+            available_orders << "most_voted" if most_voted_order_available?
             available_orders
           end
         end
 
         def default_order
-          if current_settings.votes_blocked?
+          if order_by_votes?
             detect_order("most_voted")
           else
             "random"
           end
         end
 
-        def votes_visible?
+        def most_voted_order_available?
           current_settings.votes_enabled? && !current_settings.votes_hidden?
         end
 
+        def order_by_votes?
+          most_voted_order_available? && current_settings.votes_blocked?
+        end
+
         # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
         def random_seed
           @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))

data/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -12,20 +12,30 @@ module Decidim
 
       def create
         authorize! :vote, proposal
-
-        proposal.votes.create!(author: current_user)
         @from_proposals_list = params[:from_proposals_list] == "true"
-        render :update_buttons_and_counters
+
+        VoteProposal.call(proposal, current_user) do
+          on(:ok) do
+            proposal.reload
+            render :update_buttons_and_counters
+          end
+
+          on(:invalid) do
+            render json: { error: I18n.t("proposal_votes.create.error", scope: "decidim.proposals") }, status: 422
+          end
+        end
       end
 
       def destroy
         authorize! :unvote, proposal
-
-        proposal.votes.where(author: current_user).destroy_all
-        proposal.reload
-
         @from_proposals_list = params[:from_proposals_list] == "true"
-        render :update_buttons_and_counters
+
+        UnvoteProposal.call(proposal, current_user) do
+          on(:ok) do
+            proposal.reload
+            render :update_buttons_and_counters
+          end
+        end
       end
 
       private

data/app/models/decidim/proposals/proposal.rb

@@ -87,9 +87,9 @@ module Decidim
         true
       end
 
-      # Public: Overrides the `reported_content` Reportable concern method.
-      def reported_content
-        "<h3>#{title}</h3><p>#{body}</p>"
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(self).url
       end
     end
   end

data/app/models/decidim/proposals/proposal_vote.rb

@@ -7,7 +7,6 @@ module Decidim
       belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal", counter_cache: true
       belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
 
-      validates :proposal, :author, presence: true
       validates :proposal, uniqueness: { scope: :author }
       validate :author_and_proposal_same_organization
 

data/app/views/decidim/proposals/proposals/_author.html.erb

@@ -0,0 +1,23 @@
+<div class="author-data__main">
+  <div class="author author--inline">
+    <span class="author__avatar author__avatar--small">
+      <%= image_tag proposal.author_avatar_url %>
+    </span>
+    <span class="author__name">
+      <% if proposal.author&.deleted? %>
+        <span class="label label--small label--basic">
+          <%= t('.deleted') %>
+        </span>
+      <% else %>
+        <%= proposal.author_name %>
+      <% end %>
+    </span>
+    <% if proposal.user_group && proposal.user_group.verified? %>
+      &nbsp;
+      <span class="label label--highlight label--small">
+        <%= t ".verified_user_group" %>
+      </span>
+    <% end %>
+    <%= l proposal.created_at, format: "%d/%m/%Y" %>
+  </div>
+</div>

data/app/views/decidim/proposals/proposals/_linked_proposals.html.erb

@@ -2,11 +2,11 @@
   <% resources.each do |proposal| %>
     <div class="card--list__item">
       <div class="card--list__text">
-        <%= link_to decidim_resource_path(proposal) do %>
+        <%= link_to resource_locator(proposal).path do %>
           <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
         <% end %>
         <div>
-          <%= link_to decidim_resource_path(proposal), class: "card__link" do %>
+          <%= link_to resource_locator(proposal).path, class: "card__link" do %>
             <h5 class="card--list__heading"><%= proposal.title %></h5>
           <% end %>
           <div class="author">

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

@@ -6,15 +6,7 @@
           <h5 class="card__title"><%= proposal.title %></h5>
         <% end %>
         <div class="card__author author-data author-data--small">
-          <div class="author-data__main">
-            <div class="author author--inline">
-              <span class="author__avatar author__avatar--small">
-                <%= image_tag proposal.author_avatar_url %>
-              </span>
-              <span class="author__name"><%= proposal.author_name %></span>
-              <%= l proposal.created_at, format: "%d/%m/%Y" %>
-            </div>
-          </div>
+          <%= render partial: "author", locals: { proposal: proposal } %>
         </div>
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>

data/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -1,13 +1,9 @@
 <div id="proposal-<%= proposal.id %>-vote-button">
   <% if !current_user %>
     <% if current_settings.votes_blocked? %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled" disabled data-toggle="loginModal">
-        <%= t('.votes_blocked') %>
-      </button>
+      <%= action_authorized_button_to :vote, t('.votes_blocked'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "card__button button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
     <% else %>
-      <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
-        <%= t('.vote') %>
-       </button>
+      <%= action_authorized_button_to :vote, t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
     <% end %>
   <% else %>
     <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>

data/app/views/decidim/proposals/proposals/new.html.erb

@@ -43,7 +43,7 @@
           <% end %>
 
           <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded" %>
+            <%= form.submit t(".send"), class: "button expanded", "data-disable-with" => "#{t('.send')}..." %>
           </div>
         <% end %>
       </div>

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

@@ -8,17 +8,7 @@
 <div class="row column view-header">
   <h2 class="heading2"><%= @proposal.title %></h2>
   <div class="author-data">
-    <div class="author-data__main">
-      <div class="author author--inline">
-        <span class="author__avatar">
-          <%= image_tag @proposal.author_avatar_url %>
-        </span>
-        <%= l @proposal.created_at, format: :long %>
-        <span class="author__name">
-          <%= @proposal.author_name %>
-        </span>
-      </div>
-    </div>
+    <%= render partial: "author", locals: { proposal: @proposal } %>
     <div class="author-data__extra">
       <button type="button" data-open="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" title="<%= t('.report') %>" aria-controls="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" aria-haspopup="true" tabindex="0">
         <%= icon "flag", aria_label: t('.report'), class: 'icon--small' %>

data/config/locales/ca.yml

@@ -79,7 +79,13 @@ ca:
             scope: Àmbit
             state: Estat
             title: Títol
+      proposal_votes:
+        create:
+          error: Hi ha hagut errors en votar la proposta.
       proposals:
+        author:
+          deleted: Usuari eliminat
+          verified_user_group: Organització verificada
         count:
           proposals_count:
             one: 1 proposta

data/config/locales/en.yml

@@ -81,7 +81,13 @@ en:
             scope: Scope
             state: State
             title: Title
+      proposal_votes:
+        create:
+          error: There's been errors when voting the proposal.
       proposals:
+        author:
+          deleted: Deleted user
+          verified_user_group: Verified organization
         count:
           proposals_count:
             one: 1 proposal

data/config/locales/es.yml

@@ -79,7 +79,13 @@ es:
             scope: Ámbito
             state: Estado
             title: Título
+      proposal_votes:
+        create:
+          error: Ha habido errores al votar la propuesta.
       proposals:
+        author:
+          deleted: Usuario eliminado
+          verified_user_group: Organización verificada
         count:
           proposals_count:
             one: 1 propuesta

data/config/locales/eu.yml

@@ -121,8 +121,6 @@ eu:
           most_voted: Bozkatuenak
           random: Ausazkoa eran
           recent: Berrienak
-        proposal:
-          view_proposal: Ikusi proposamena
         show:
           proposal_accepted_reason: 'Proposamen hau onartu da arrazoi hauengatik:'
           proposal_rejected_reason: 'Proposamen hau baztertu da arrazoi hauengatik:'

data/config/locales/fi.yml

@@ -108,8 +108,6 @@ fi:
           most_voted: Eniten ääniä saaneet
           random: Satunnainen
           recent: Viimeisimmät
-        proposal:
-          view_proposal: Näytä ehdotus
         show:
           proposal_accepted_reason: 'Tämä ehdotus on hyväksytty, koska:'
           proposal_rejected_reason: 'Tämä ehdotus on hylätty, koska:'

data/config/locales/fr.yml

@@ -118,8 +118,6 @@ fr:
           most_voted: Les plus votées
           random: Aléatoire
           recent: Les plus récents
-        proposal:
-          view_proposal: Voir la proposition
         show:
           proposal_accepted_reason: 'Cette proposition a été acceptée parce que :'
           proposal_rejected_reason: 'Cette proposition a été refusée parce que:'

data/config/locales/it.yml

@@ -0,0 +1,147 @@
+it:
+  activemodel:
+    attributes:
+      proposal:
+        body: Corpo del testo
+        category_id: Categoria
+        scope_id: Visibilità
+        title: Titolo
+        user_group_id: Crea proposta come
+      proposal_answer:
+        answer: Risposta
+  decidim:
+    features:
+      proposals:
+        actions:
+          create: Crea
+          vote: Vota
+        name: Proposte
+        settings:
+          global:
+            comments_enabled: Commenti abilitati
+            geocoding_enabled: Geocoding abilitato
+            official_proposals_enabled: Proposte ufficiali abilitate
+            proposal_answering_enabled: Risposta Proposte abilitata
+            vote_limit: Numero max di proposte votabili
+          step:
+            comments_blocked: Commenti bloccati
+            creation_enabled: Creazione delle Proposte abilitata
+            proposal_answering_enabled: Risposta Proposte abilitata
+            votes_blocked: Votazioni bloccate
+            votes_enabled: Votazioni abilitate
+            votes_hidden: Voti nascosti (se i voti sono abilitati, spuntando questa casella verrà nascosto il numero dei voti)
+    proposals:
+      actions:
+        answer: Risposta
+        new: Nuovo
+        title: Azioni
+      admin:
+        actions:
+          preview: Anteprima
+        exports:
+          proposals: Proposte
+        models:
+          proposal:
+            name: Proposta
+        proposal_answers:
+          edit:
+            accepted: Accettata
+            answer_proposal: Risposta
+            rejected: Rifiutata
+            title: Risposta per la proposta %{title}
+        proposals:
+          answer:
+            invalid: E' stato riscontrato un problema nella risposta per questa proposta
+            success: OK, risposta per la proposta registrata.
+          create:
+            invalid: Sono stati riscontrati dei problemi durante la creazione di questa proposta
+            success: OK, proposta creata.
+          form:
+            select_a_category: Scegli una categoria
+          index:
+            title: Proposte
+          new:
+            create: Crea
+            title: Crea una proposta
+      answers:
+        accepted: Accettata
+        not_answered: Non risposto
+        rejected: Rifiutata
+      create:
+        error: C'è stato un errore durante il salvataggio di questa proposta.
+        success: OK, la proposta è stata creata.
+      models:
+        proposal:
+          fields:
+            category: Categoria
+            official_proposal: Proposta ufficiale
+            scope: Visibilità
+            state: Stato
+            title: Titolo
+      proposals:
+        count:
+          proposals_count:
+            one: 1 proposta
+            other: "%{count} proposte"
+        filters:
+          accepted: Accettata
+          activity: Attività
+          category: Categoria
+          category_prompt: Scegli una categoria
+          citizenship: Cittadinanza
+          official: Ufficiale
+          origin: Origine
+          rejected: Rifiutata
+          related_to: Associata a
+          scopes: Visibilità
+          search: Cerca
+          state: Stato
+          voted: Votata
+        filters_small_view:
+          close_modal: Chiudi modalità
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Espandi
+        index:
+          new_proposal: Nuova proposta
+          view_proposal: Visualizza proposta
+        linked_proposals:
+          proposal_votes:
+            one: <span class="card--list__data__number">1</span>voto
+            other: <span class="card--list__data__number">%{count}</span>voti
+        new:
+          back: Indietro
+          select_a_category: Scegli una categoria
+          send: Invia
+          title: Nuova proposta
+        orders:
+          label: 'Ordina le proposte per:'
+          most_voted: Più votate
+          random: A caso
+          recent: le più recenti
+        proposal:
+          view_proposal: Visualizza la proposta
+        show:
+          proposal_accepted_reason: 'Questa proposta è stata accettata perché:'
+          proposal_rejected_reason: 'Questa proposta è stata rifiutata perché:'
+        vote_button:
+          already_voted: Già votata
+          no_votes_remaining: Sono finite le votazioni possibili
+          vote: Vota
+          votes_blocked: Votazioni disabilitate
+        votes_count:
+          count:
+            one: VOTO
+            other: VOTI
+        votes_limit:
+          vote_limit:
+            description: Invece di votare tutte le proposte possibili puoi soltanto votare fino a %{limit} proposte.
+            left: Restano
+            title: Hai ancora %{limit} voti
+            votes: Voti
+    resource_links:
+      included_proposals:
+        proposal_projects: 'Le proposte compaiono nei seguenti progetti:'
+        proposal_results: 'Le proposte compaiono nei seguenti risultati:'
+      proposals_from_meeting:
+        proposal_meetings: Meeting associati alla proposta

data/db/migrate/20161212110850_create_decidim_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDecidimProposals < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_proposals_proposals do |t|

data/db/migrate/20170112115253_create_proposal_votes.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class CreateProposalVotes < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_proposals_proposal_votes do |t|
       t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_vote_proposal" }
       t.references :decidim_author, null: false, index: { name: "decidim_proposals_proposal_vote_author" }
-      
+
       t.timestamps
     end
 

data/db/migrate/20170113114245_add_text_search_indexes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddTextSearchIndexes < ActiveRecord::Migration[5.0]
   def change
     add_index :decidim_proposals_proposals, :title, name: "decidim_proposals_proposal_title_search"

data/db/migrate/20170118120151_add_counter_cache_votes_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCounterCacheVotesToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :proposal_votes_count, :integer, null: false, default: 0

data/db/migrate/20170120151202_add_user_group_id_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddUserGroupIdToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :decidim_user_group_id, :integer, index: true

data/db/migrate/20170131092413_add_answers_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAnswersToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :state, :string, index: true

data/db/migrate/20170205082832_add_index_to_decidim_proposals_proposals_proposal_votes_count.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIndexToDecidimProposalsProposalsProposalVotesCount < ActiveRecord::Migration[5.0]
   def change
     add_index :decidim_proposals_proposals, :proposal_votes_count

data/db/migrate/20170215113152_create_proposal_reports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateProposalReports < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_proposals_proposal_reports do |t|

data/db/migrate/20170215131720_add_report_count_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReportCountToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :report_count, :integer, default: 0

data/db/migrate/20170215132030_add_reference_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferenceToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :reference, :string

data/db/migrate/20170220152416_add_hidden_at_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddHiddenAtToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :hidden_at, :datetime

data/db/migrate/20170228105156_add_geolocalization_fields_to_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddGeolocalizationFieldsToProposals < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_proposals_proposals, :address, :text

data/db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
   class Decidim::Proposals::ProposalReport < ApplicationRecord
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -6,16 +8,12 @@ class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
 
   def change
     Decidim::Proposals::ProposalReport.all.each do |proposal_report|
-      moderation = Decidim::Moderation.find_or_create_by!({
-        reportable: proposal_report.proposal,
-        participatory_process: proposal_report.proposal.feature.participatory_process
-      })
-      Decidim::Report.create!({
-        moderation: moderation,
-        user: proposal_report.user,
-        reason: proposal_report.reason,
-        details: proposal_report.details
-      })
+      moderation = Decidim::Moderation.find_or_create_by!(reportable: proposal_report.proposal,
+                                                          participatory_process: proposal_report.proposal.feature.participatory_process)
+      Decidim::Report.create!(moderation: moderation,
+                              user: proposal_report.user,
+                              reason: proposal_report.reason,
+                              details: proposal_report.details)
       moderation.update_attributes!(report_count: moderation.report_count + 1)
     end
 

data/db/migrate/20170410073742_remove_not_null_reference_proposals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveNotNullReferenceProposals < ActiveRecord::Migration[5.0]
   def change
     change_column_null :decidim_proposals_proposals, :reference, true

data/db/migrate/20170612101809_migrate_proposals_category.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MigrateProposalsCategory < ActiveRecord::Migration[5.1]
+  def change
+    # Create categorizations ensuring database integrity
+    execute('
+      INSERT INTO decidim_categorizations(decidim_category_id, categorizable_id, categorizable_type, created_at, updated_at)
+        SELECT decidim_category_id, decidim_proposals_proposals.id, \'Decidim::Proposals::Proposal\', NOW(), NOW()
+        FROM decidim_proposals_proposals
+        INNER JOIN decidim_categories ON decidim_categories.id = decidim_proposals_proposals.decidim_category_id
+    ')
+    # Remove unused column
+    remove_column :decidim_proposals_proposals, :decidim_category_id
+  end
+end

data/lib/decidim/proposals/feature.rb

@@ -92,13 +92,17 @@ Decidim.register_feature(:proposals) do |feature|
       scopes = feature.organization.scopes + [nil]
 
       20.times do |n|
+        author = Decidim::User.where(organization: feature.organization).all.sample
+        user_group = [true, false].sample ? author.user_groups.verified.sample : nil
+
         proposal = Decidim::Proposals::Proposal.create!(
           feature: feature,
           category: categories.sample,
           scope: scopes.sample,
           title: Faker::Lorem.sentence(2),
           body: Faker::Lorem.paragraphs(2).join("\n"),
-          author: Decidim::User.where(organization: feature.organization).all.sample
+          author: author,
+          user_group: user_group
         )
 
         if n > 15

data/lib/decidim/proposals/proposal_serializer.rb

@@ -46,12 +46,7 @@ module Decidim
 
       def meetings
         @proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
-          decidim_resource_url(
-            meeting,
-            feature_id: feature,
-            participatory_process_id: participatory_process,
-            host: organization.host
-          )
+          Decidim::ResourceLocatorPresenter.new(meeting).url
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: A proposals component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -158,6 +158,8 @@ files:
 - app/commands/decidim/proposals/admin/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal_export.rb
+- app/commands/decidim/proposals/unvote_proposal.rb
+- app/commands/decidim/proposals/vote_proposal.rb
 - app/controllers/concerns/decidim/proposals/orderable.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
 - app/controllers/decidim/proposals/admin/proposal_answers_controller.rb
@@ -186,6 +188,7 @@ files:
 - app/views/decidim/proposals/admin/proposals/new.html.erb
 - app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
 - app/views/decidim/proposals/proposal_widgets/show.html.erb
+- app/views/decidim/proposals/proposals/_author.html.erb
 - app/views/decidim/proposals/proposals/_count.html.erb
 - app/views/decidim/proposals/proposals/_filters.html.erb
 - app/views/decidim/proposals/proposals/_filters_small_view.html.erb
@@ -210,6 +213,7 @@ files:
 - config/locales/eu.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/nl.yml
 - db/migrate/20161212110850_create_decidim_proposals.rb
 - db/migrate/20170112115253_create_proposal_votes.rb
@@ -225,6 +229,7 @@ files:
 - db/migrate/20170228105156_add_geolocalization_fields_to_proposals.rb
 - db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb
 - db/migrate/20170410073742_remove_not_null_reference_proposals.rb
+- db/migrate/20170612101809_migrate_proposals_category.rb
 - lib/decidim/proposals.rb
 - lib/decidim/proposals/admin.rb
 - lib/decidim/proposals/admin_engine.rb