decidim-results 0.0.7 → 0.0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bce1cb6ba23326936c124fdff52091a3b88d475
-  data.tar.gz: 2dbacdf87d94a066fb1ab0ed62a33ce58d5ce2ec
+  metadata.gz: 7e4356f2a615206f1b6dd421749991b3ee2246a0
+  data.tar.gz: 4bca5a90b0eefb2187b6a83094481ea1e33c5dd1
 SHA512:
-  metadata.gz: 5e210bf12e1a3c0adf709cb6b26052b11af284d1279379d38faf1bf27fe32dca58f87e479420f5a54c60e0a372f096610ba387802c5043c34b660ccfc3572b79
-  data.tar.gz: 91fd009e2c25038bd8c54a79ebcff60043125071bd31f49073e58d4d40b8e34569ab0fcf94648405bb428a7d1db4c280024f21f274627df25241ac8215c20b0a
+  metadata.gz: f1c71e1c04236bc51ef4aa65e9e79349e49414f3a0a738e391f81669c8ef734ffabddb8d5a4b0284ae251889ce877f97215775ec17ef7b98e61529210b8f4499
+  data.tar.gz: 1bbf496bdee38cdfde0d41bc81c3bea55a19fae25416256feedffd602c1a93c080e170bc87d853948f0195062fa900d73cd924c563e431c8693a6b9890311d58

data/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/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/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/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/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/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/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/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/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/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/config/locales/fr.yml

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

data/config/locales/nl.yml

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

data/db/migrate/20170410074358_remove_not_null_reference_results.rb

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

data/lib/decidim/results/list_engine.rb

@@ -11,7 +11,9 @@ module Decidim
       isolate_namespace Decidim::Results
 
       routes do
-        resources :results, only: [:index, :show]
+        resources :results, only: [:index, :show] do
+          resource :result_widget, only: :show, path: "embed"
+        end
         root to: "results#index"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-results
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-27 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.0.7
+        version: 0.0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8.1
 description: ''
 email:
 - josepjaume@gmail.com
@@ -155,6 +155,7 @@ files:
 - app/controllers/decidim/results/admin/application_controller.rb
 - app/controllers/decidim/results/admin/results_controller.rb
 - app/controllers/decidim/results/application_controller.rb
+- app/controllers/decidim/results/result_widgets_controller.rb
 - app/controllers/decidim/results/results_controller.rb
 - app/forms/decidim/results/admin/result_form.rb
 - app/helpers/decidim/results/application_helper.rb
@@ -166,6 +167,7 @@ files:
 - app/views/decidim/results/admin/results/edit.html.erb
 - app/views/decidim/results/admin/results/index.html.erb
 - app/views/decidim/results/admin/results/new.html.erb
+- app/views/decidim/results/result_widgets/show.html.erb
 - app/views/decidim/results/results/_count.html.erb
 - app/views/decidim/results/results/_filters.html.erb
 - app/views/decidim/results/results/_filters_small_view.html.erb
@@ -181,16 +183,19 @@ files:
 - config/locales/es.yml
 - config/locales/eu.yml
 - config/locales/fi.yml
+- config/locales/fr.yml
+- config/locales/nl.yml
 - db/migrate/20170116104125_create_results.rb
 - db/migrate/20170129164553_remove_short_description_from_results.rb
 - db/migrate/20170215132624_add_reference_to_results.rb
+- db/migrate/20170410074358_remove_not_null_reference_results.rb
 - lib/decidim/results.rb
 - lib/decidim/results/admin.rb
 - lib/decidim/results/admin_engine.rb
 - lib/decidim/results/feature.rb
 - lib/decidim/results/list_engine.rb
 - lib/decidim/results/test/factories.rb
-homepage: https://github.com/AjuntamentdeBarcelona/decidim
+homepage: https://github.com/decidim/decidim
 licenses:
 - AGPLv3
 metadata: {}