decidim 0.0.7 → 0.0.8.1

data/decidim-proposals/config/locales/fi.yml

@@ -13,7 +13,6 @@ fi:
     features:
       proposals:
         actions:
-          create: Luo ehdotuksia
           vote: Äänestä
         name: Ehdotukset
         settings:
@@ -40,7 +39,6 @@ fi:
         proposal_answers:
           edit:
             accepted: Hyväksytty
-            answer_proposal: Vastaa ehdotukseen
             rejected: Hylätty
             title: 'Vastaa ehdotukseen: %{title}'
         proposals:
@@ -54,9 +52,6 @@ fi:
             select_a_category: Valitse kategoria
           index:
             title: Ehdotukset
-          new:
-            create: Luo ehdotus
-            title: Uusi ehdotus
       answers:
         accepted: Hyväksytty
         not_answered: Vastaamaton

data/decidim-proposals/config/locales/fr.yml

@@ -0,0 +1,5 @@
+fr:
+  activemodel:
+    attributes:
+      proposal:
+        title: Titre

data/decidim-proposals/config/locales/nl.yml

@@ -0,0 +1,5 @@
+nl:
+  activemodel:
+    attributes:
+      proposal:
+        title: Titel

data/decidim-proposals/db/migrate/20170410073742_remove_not_null_reference_proposals.rb

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

data/decidim-proposals/lib/decidim/proposals/engine.rb

@@ -13,6 +13,7 @@ module Decidim
       routes do
         resources :proposals, only: [:create, :new, :index, :show] do
           resource :proposal_vote, only: [:create, :destroy]
+          resource :proposal_widget, only: :show, path: "embed"
         end
         root to: "proposals#index"
       end

data/decidim-proposals/lib/decidim/proposals/feature.rb

@@ -26,6 +26,7 @@ Decidim.register_feature(:proposals) do |feature|
   feature.settings(:step) do |settings|
     settings.attribute :votes_enabled, type: :boolean
     settings.attribute :votes_blocked, type: :boolean
+    settings.attribute :votes_hidden, type: :boolean, default: false
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true

data/decidim-proposals/spec/features/proposals_spec.rb

@@ -46,7 +46,6 @@ describe "Proposals", type: :feature do
 
           it "can be related to a scope" do
             visit_feature
-
             click_link "New proposal"
 
             within "form.new_proposal" do
@@ -62,7 +61,6 @@ describe "Proposals", type: :feature do
 
           it "cannot be related to a scope" do
             visit_feature
-
             click_link "New proposal"
 
             within "form.new_proposal" do
@@ -104,7 +102,6 @@ describe "Proposals", type: :feature do
 
           it "creates a new proposal" do
             visit_feature
-
             click_link "New proposal"
 
             within ".new_proposal" do
@@ -136,7 +133,6 @@ describe "Proposals", type: :feature do
 
           it "creates a new proposal as a user group" do
             visit_feature
-
             click_link "New proposal"
 
             within ".new_proposal" do
@@ -160,7 +156,7 @@ describe "Proposals", type: :feature do
           context "when geocoding is enabled" do
             let!(:feature) do
               create(:proposal_feature,
-                    :with_creation_enabled,          
+                    :with_creation_enabled,
                     :with_geocoding_enabled,
                     manifest: manifest,
                     participatory_process: participatory_process)
@@ -168,7 +164,6 @@ describe "Proposals", type: :feature do
 
             it "creates a new proposal as a user group" do
               visit_feature
-
               click_link "New proposal"
 
               within ".new_proposal" do

data/decidim-proposals/spec/features/vote_proposal_spec.rb

@@ -22,6 +22,21 @@ describe "Vote Proposal", type: :feature do
     end
   end
 
+  context "when votes are blocked" do
+    let!(:feature) do
+      create(:proposal_feature,
+        :with_votes_blocked,
+        manifest: manifest,
+        participatory_process: participatory_process)
+    end
+
+    it "shows the vote count and the vote button is disabled" do
+      visit_feature
+      expect(page).to have_css('.card__support__data', text: "0 VOTES")
+      expect(page).to have_content("Voting disabled")
+    end
+  end
+
   context "when votes are enabled" do
     let!(:feature) do
       create(:proposal_feature,

data/decidim-proposals/spec/helpers/proposal_order_helper_spec.rb

@@ -10,10 +10,20 @@ module Decidim
 
       describe "#order_fields" do
         context "with votes enabled" do
-          let(:current_settings) { double(:current_settings, { votes_enabled?: true }) }
+          context "with votes hidden" do
+            let(:current_settings) { double(:current_settings, { votes_enabled?: true, votes_hidden?: true }) }
 
-          it "shows most_voted option to sort" do
-            expect(helper.order_fields).to include(:most_voted)
+            it "does not show most_voted option to sort" do
+              expect(helper.order_fields).not_to include(:most_voted)
+            end
+          end
+
+          context "with votes not hidden" do
+            let(:current_settings) { double(:current_settings, { votes_enabled?: true, votes_hidden?: false }) }
+
+            it "shows most_voted option to sort" do
+              expect(helper.order_fields).to include(:most_voted)
+            end
           end
         end
 

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -48,7 +48,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "can be related to a scope" do
-            click_link "New Proposal"
+            find(".card-title a.button").click
 
             within "form" do
               expect(page).to have_content(/Scope/i)
@@ -56,7 +56,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "creates a new proposal" do
-            click_link "New Proposal"
+            find(".card-title a.button").click
 
             within ".new_proposal" do
               fill_in :proposal_title, with: "Make decidim great again"
@@ -88,7 +88,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "cannot be related to a scope" do
-            click_link "New Proposal"
+            find(".card-title a.button").click
 
             within "form" do
               expect(page).not_to have_content(/Scope/i)
@@ -96,7 +96,7 @@ RSpec.shared_examples "manage proposals" do
           end
 
           it "creates a new proposal related to the process scope" do
-            click_link "New Proposal"
+            find(".card-title a.button").click
 
             within ".new_proposal" do
               fill_in :proposal_title, with: "Make decidim great again"
@@ -128,7 +128,7 @@ RSpec.shared_examples "manage proposals" do
             end
 
             it "creates a new proposal related to the process scope" do
-              click_link "New Proposal"
+              find(".card-title a.button").click
 
               within ".new_proposal" do
                 fill_in :proposal_title, with: "Make decidim great again"
@@ -186,7 +186,7 @@ RSpec.shared_examples "manage proposals" do
 
       it "can reject a proposal" do
         within find("tr", text: proposal.title) do
-          click_link "Answer"
+          find("a.action-icon--edit-answer").click
         end
 
         within ".edit_proposal_answer" do
@@ -198,7 +198,7 @@ RSpec.shared_examples "manage proposals" do
             ca: "La proposta no te sentit"
           )
           choose "Rejected"
-          click_button "Answer proposal"
+          click_button "Answer"
         end
 
         within ".callout-wrapper" do
@@ -214,12 +214,46 @@ RSpec.shared_examples "manage proposals" do
 
       it "can accept a proposal" do
         within find("tr", text: proposal.title) do
-          click_link "Answer"
+          find("a.action-icon--edit-answer").click
         end
 
         within ".edit_proposal_answer" do
           choose "Accepted"
-          click_button "Answer proposal"
+          click_button "Answer"
+        end
+
+        within ".callout-wrapper" do
+          expect(page).to have_content("Proposal successfully answered")
+        end
+
+        within find("tr", text: proposal.title) do
+          within find("td:nth-child(4)") do
+            expect(page).to have_content("Accepted")
+          end
+        end
+      end
+
+      it "can edit a proposal answer" do
+        proposal.update_attributes!(
+          state: 'rejected',
+          answer: {
+            'en' => "I don't like it"
+          },
+          answered_at: Time.current
+        )
+
+        visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
+
+        within find("tr", text: proposal.title) do
+          within find("td:nth-child(4)") do
+            expect(page).to have_content("Rejected")
+          end
+          find("a.action-icon--edit-answer").click
+        end
+
+        within ".edit_proposal_answer" do
+          choose "Accepted"
+          click_button "Answer"
         end
 
         within ".callout-wrapper" do

data/decidim-results/README.md

@@ -17,7 +17,7 @@ $ bundle
 ```
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

data/decidim-results/app/controllers/decidim/results/result_widgets_controller.rb

@@ -0,0 +1,17 @@
+module Decidim
+  module Results
+    class ResultWidgetsController < Decidim::WidgetsController
+      helper_method :model
+
+      private
+
+      def model
+        @model ||= Result.where(feature: params[:feature_id]).find(params[:result_id])
+      end
+
+      def iframe_url
+        @iframe_url ||= result_result_widget_url(model)
+      end
+    end
+  end
+end

data/decidim-results/app/controllers/decidim/results/results_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     # Exposes the result resource so users can view them
     class ResultsController < Decidim::Results::ApplicationController
       include FilterResource
+      helper Decidim::WidgetUrlsHelper
 
       helper_method :results, :result, :stats_calculator
 

data/decidim-results/app/views/decidim/results/result_widgets/show.html.erb

@@ -0,0 +1,10 @@
+<div class="column">
+  <article class="card card--result">
+    <div class="card__content">
+      <%= link_to model, class: "card__link" do %>
+        <h5 class="card__title"><%= translated_attribute model.title %></h5>
+      <% end %>
+      <%== translated_attribute model.description %>
+    </div>
+  </article>
+</div>

data/decidim-results/app/views/decidim/results/results/show.html.erb

@@ -40,6 +40,7 @@
     </div>
     <%= feature_reference(result) %>
     <%= render partial: "decidim/shared/share_modal" %>
+    <%= embed_modal_for result_result_widget_url(result, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">

data/decidim-results/config/locales/ca.yml

@@ -26,7 +26,7 @@ ca:
         confirm_destroy: Esteu segur que voleu suprimir aquest resultat?
         destroy: Esborra
         edit: Edita
-        new: Nou/va %{name}
+        new: Nou
         preview: Previsualitzar
         title: Accions
       admin:
@@ -41,11 +41,11 @@ ca:
             success: El resultat ha estat eliminat correctament
           edit:
             title: Edita resultat
-            update: Actualitza resultat
+            update: Actualitzar
           index:
             title: Resultats
           new:
-            create: Crea resultat
+            create: Crear
             title: Nou resultat
           update:
             invalid: Hi ha hagut un problema en actualitzar aquest resultat

data/decidim-results/config/locales/en.yml

@@ -27,7 +27,7 @@ en:
         confirm_destroy: Are you sure you want to delete this result?
         destroy: Delete
         edit: Edit
-        new: New %{name}
+        new: New
         preview: Preview
         title: Actions
       admin:
@@ -42,11 +42,11 @@ en:
             success: Result successfully deleted
           edit:
             title: Edit result
-            update: Update result
+            update: Update
           index:
             title: Results
           new:
-            create: Create result
+            create: Create
             title: New result
           update:
             invalid: There's been a problem updating this result

data/decidim-results/config/locales/es.yml

@@ -26,7 +26,7 @@ es:
         confirm_destroy: '¿Está seguro de que quiere eliminar este resultado?'
         destroy: Borrar
         edit: Editar
-        new: Nuevo/a %{name}
+        new: Nuevo
         preview: Previsualizar
         title: Acciones
       admin:
@@ -41,11 +41,11 @@ es:
             success: El resultado se ha eliminado correctamente
           edit:
             title: Editar resultado
-            update: Actualizar resultado
+            update: Actualizar
           index:
             title: Resultados
           new:
-            create: Crear resultado
+            create: Crear
             title: Nuevo resultado
           update:
             invalid: Ha habido un problema al actualizar este resultado

data/decidim-results/config/locales/eu.yml

@@ -26,7 +26,6 @@ eu:
         confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
         destroy: Ezabatu
         edit: Editatu
-        new: '%{name} berria'
         preview: Aurreikusi
         title: Ekintzak
       admin:
@@ -41,11 +40,9 @@ eu:
             success: Emaitza zuzen ezabatu da.
           edit:
             title: Editatu emaitza
-            update: Eguneratu emaitza
           index:
             title: Emaitzak
           new:
-            create: Sortu emaitza
             title: Emaitza berria
           update:
             invalid: Arazo bat izan da emaitza hau eguneratzean.

data/decidim-results/config/locales/fi.yml

@@ -26,7 +26,6 @@ fi:
         confirm_destroy: Oletko varma, että haluat poistaa tämän tuloksen?
         destroy: Poista
         edit: Muokkaa
-        new: Uusi %{name}
         title: Toiminnot
       admin:
         models:
@@ -40,11 +39,9 @@ fi:
             success: Tulos poistettu onnistuneesti
           edit:
             title: Muokkaa tulosta
-            update: Päivitä tulos
           index:
             title: Tulokset
           new:
-            create: Luo tulos
             title: Uusi tulos
           update:
             invalid: Tuloksen päivityksessä tapahtui virhe

data/decidim-results/config/locales/fr.yml

@@ -0,0 +1,5 @@
+fr:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Catégorie