decidim-results 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b31f33002d2e563b304b59e39a656bd5f8cce64
-  data.tar.gz: f38e1469828e9db0a67349ddc217a734d7c0bb64
+  metadata.gz: 261211327c81628f79052e961210bac9bea4bcf6
+  data.tar.gz: eac6d159d8e9fc48bd38a17f5ca64c8363f756f1
 SHA512:
-  metadata.gz: a18ff00b0d57bcaed24fbc52df0f50cbb5d8bf7c457b0651588bd70156411d28e5eab45ccd3295d53c261e213faf11ce3408a27fd06d4ebbb9d08761c25f2cce
-  data.tar.gz: e3e967335b57634c6ab80b73c4d9abfe37d92350f0b00cb007e9ef9512aa33ca4cbfd627c4ba029f638aee263a9ebc14c6d3eb0388de1b4792525f03b5f8c2cd
+  metadata.gz: 9286d8c4a2ecc6fed04858739afd96158f7fff82c57b956d5520d794c0a267313c18c5150f05fd67acc035bf068dc7bd58d675e9dbb310b34a2e3aaf196df5a0
+  data.tar.gz: 1a98a65bd335620cb04a26203d427fd820894e89f4544cdfdb28aa17bbacbf0eb5c5e124aa2a1dab47604318e9611ec27ebb8f8a77c8e9bbb8be83d33c1612dd

data/app/models/decidim/results/result.rb

@@ -8,8 +8,29 @@ module Decidim
       include Decidim::HasFeature
       include Decidim::HasScope
       include Decidim::HasCategory
+      include Decidim::Comments::Commentable
 
       feature_manifest_name "results"
+
+      # Public: Overrides the `commentable?` Commentable concern method.
+      def commentable?
+        feature.settings.comments_enabled?
+      end
+
+      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
+      def accepts_new_comments?
+         commentable? && !feature.active_step_settings.comments_blocked
+      end
+
+      # Public: Overrides the `comments_have_alignment?` Commentable concern method.
+      def comments_have_alignment?
+        true
+      end
+
+      # Public: Overrides the `comments_have_votes?` Commentable concern method.
+      def comments_have_votes?
+        true
+      end
     end
   end
 end

data/app/views/decidim/results/admin/results/edit.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/app/views/decidim/results/admin/results/new.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

data/app/views/decidim/results/results/index.html.erb

@@ -1,5 +1,3 @@
-<% content_for(:title, t(".title")) %>
-
 <div class="row columns">
   <div class="title-action">
     <h2 id="proposals-count" class="title-action__title section-heading">

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

@@ -1,4 +1,8 @@
-<% content_for(:title, translated_attribute(result.title)) %>
+<% add_decidim_meta_tags({
+  description: translated_attribute(result.description),
+  title: translated_attribute(result.title),
+  url: result_url(result.id)
+}) %>
 
 <div class="row column view-header">
   <h2 class="heading2"><%= translated_attribute result.title %></h2>
@@ -34,6 +38,7 @@
         </div>
       </div>
     </div>
+    <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
@@ -45,8 +50,7 @@
   </div>
 </div>
 
-<%= content_for :expanded do %>
-  <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
-    <%= comments_for result, arguable: true, votable: true %>
-  <% end %>
-<% end %>
+<%= comments_for result %>
+
+<%= javascript_include_tag "decidim/proposals/social_share" %>
+<%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/config/i18n-tasks.yml

@@ -2,4 +2,5 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.results.name"
+- "decidim.features.results.settings.*"
 - "decidim.resource_links.*"

data/config/locales/ca.yml

@@ -3,6 +3,11 @@ ca:
     features:
       results:
         name: Resultats
+        settings:
+          global:
+            comments_enabled: Comentaris habilitats
+          step:
+            comments_blocked: Comentaris bloquejats
     resource_links:
       included_proposals:
         proposals: Propostes incloses en aquest resultat
@@ -49,13 +54,11 @@ ca:
           category: Categoria
           scopes: Àmbits
           search: Cerca
-        index:
-          title: Resultats
         show:
           stats:
             attendees: Assistents
             comments: Comentaris
             contributions: Aportacions
-            meetings: Llistat de trobades
+            meetings: Trobades
             proposals: Propostes
             votes: Suports

data/config/locales/en.yml

@@ -4,6 +4,11 @@ en:
     features:
       results:
         name: Results
+        settings:
+          global:
+            comments_enabled: Comments enabled
+          step:
+            comments_blocked: Comments blocked
     resource_links:
       included_proposals:
         proposals: Proposals included in this result
@@ -50,8 +55,6 @@ en:
           category: Category
           scopes: Scopes
           search: Search
-        index:
-          title: Results
         show:
           stats:
             attendees: Attendees

data/config/locales/es.yml

@@ -3,6 +3,11 @@ es:
     features:
       results:
         name: Resultados
+        settings:
+          global:
+            comments_enabled: Comentarios habilitados
+          step:
+            comments_blocked: Comentarios bloqueados
     resource_links:
       included_proposals:
         proposals: Propuestas incluidas en este resultado
@@ -49,8 +54,6 @@ es:
           category: Categoría
           scopes: Ámbitos
           search: Buscar
-        index:
-          title: Resultados
         show:
           stats:
             attendees: Asistentes

data/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  decidim:
+    features:
+      results:
+        name: Emaitzak

data/lib/decidim/results/feature.rb

@@ -17,11 +17,11 @@ Decidim.register_feature(:results) do |feature|
   end
 
   feature.settings(:global) do |settings|
-    settings.attribute :comments_always_enabled, type: :boolean, default: true
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
-    settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
   feature.seeds do
@@ -31,6 +31,7 @@ Decidim.register_feature(:results) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :results).i18n_name,
         manifest_name: :results,
+        published_at: Time.current,
         participatory_process: process
       )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-results
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-17 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.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 description: ''
 email:
 - josepjaume@gmail.com
@@ -178,6 +178,7 @@ files:
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/eu.yml
 - db/migrate/20170116104125_create_results.rb
 - db/migrate/20170129164553_remove_short_description_from_results.rb
 - lib/decidim/results.rb