decidim-proposals 0.0.3 → 0.0.5

data/config/locales/es.yml

@@ -10,10 +10,21 @@ es:
   decidim:
     features:
       proposals:
+        actions:
+          create: Crear propuestas
+          vote: Votar
         name: Propuestas
         settings:
+          global:
+            comments_enabled: Comentarios habilitados
+            official_proposals_enabled: Propuestas oficiales habilitadas
+            proposal_answering_enabled: Respuesta oficial a propuestas habilitadas
+            scoped_proposals_enabled: Propuestas con ámbito
+            vote_limit: Límite de votos
           step:
+            comments_blocked: Comentarios bloqueados
             creation_enabled: Habilitar creación de propuestas
+            proposal_answering_enabled: Respuesta a propuestas activadas
             votes_blocked: Votación bloqueada
             votes_enabled: Votos habilitados
     proposals:
@@ -75,6 +86,8 @@ es:
           official: Oficial
           origin: Origen
           rejected: Rechazadas
+          related_to: Relacionado con
+          scopes: Ámbitos
           search: Buscar
           state: Estado
           voted: Votado
@@ -95,13 +108,15 @@ es:
           select_a_scope: Por favor, seleccione un ámbito
           send: Enviar
           title: Nueva propuesta
+        orders:
+          label: 'Ordenar propuestas por:'
+          most_voted: Más votado
+          random: Aleatorio
+          recent: Reciente
         proposal:
           view_proposal: Ver propuesta
-        share:
-          close_window: Cerrar ventana
-          share: Compartir
-          share_link: Compartir enlace
         show:
+          proposal_accepted_reason: 'Esta propuesta ha sido aceptada porque:'
           proposal_rejected_reason: 'Esta propuesta ha sido rechazada porque:'
         vote_button:
           already_voted: Ya votado

data/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  activemodel:
+    attributes:
+      proposal:
+        category_id: Kategoria

data/db/migrate/20170205082832_add_index_to_decidim_proposals_proposals_proposal_votes_count.rb

@@ -0,0 +1,7 @@
+class AddIndexToDecidimProposalsProposalsProposalVotesCount < ActiveRecord::Migration[5.0]
+  def change
+    add_index :decidim_proposals_proposals, :proposal_votes_count
+    add_index :decidim_proposals_proposals, :created_at
+    add_index :decidim_proposals_proposals, :state
+  end
+end

data/lib/decidim/proposals/admin_engine.rb

@@ -14,6 +14,13 @@ module Decidim
         root to: "proposals#index"
       end
 
+      initializer "decidim_proposals.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.admin_abilities += ["Decidim::Proposals::Abilities::AdminUser"]
+          config.admin_abilities += ["Decidim::Proposals::Abilities::ProcessAdminUser"]
+        end
+      end
+
       def load_seed
         nil
       end

data/lib/decidim/proposals/feature.rb

@@ -13,16 +13,22 @@ Decidim.register_feature(:proposals) do |feature|
     end
   end
 
+  feature.actions = %w(vote create)
+
   feature.settings(:global) do |settings|
     settings.attribute :vote_limit, type: :integer, default: 0
-    settings.attribute :comments_always_enabled, type: :boolean, default: true
+    settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    settings.attribute :official_proposals_enabled, type: :boolean, default: true
+    settings.attribute :scoped_proposals_enabled, type: :boolean, default: true
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
     settings.attribute :votes_enabled, type: :boolean
     settings.attribute :votes_blocked, type: :boolean
-    settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
+    settings.attribute :proposal_answering_enabled, type: :boolean, default: true
   end
 
   feature.register_resource do |resource|
@@ -37,6 +43,7 @@ Decidim.register_feature(:proposals) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
         manifest_name: :proposals,
+        published_at: Time.current,
         participatory_process: process,
         settings: {
           vote_limit: 0
@@ -45,10 +52,14 @@ Decidim.register_feature(:proposals) do |feature|
           process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
         }
       )
+      categories = feature.participatory_process.categories
+      scopes = feature.organization.scopes
 
       20.times do |n|
         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
@@ -75,7 +86,9 @@ Decidim.register_feature(:proposals) do |feature|
                                          name: name,
                                          organization: feature.organization,
                                          tos_agreement: "1",
-                                         confirmed_at: Time.now)
+                                         confirmed_at: Time.current,
+                                         comments_notifications: true,
+                                         replies_notifications: true)
 
           Decidim::Proposals::ProposalVote.create!(proposal: proposal,
                                                    author: author)

data/lib/decidim/proposals/test/factories.rb

@@ -7,7 +7,7 @@ require "decidim/results/test/factories"
 require "decidim/budgets/test/factories"
 
 FactoryGirl.define do
-  factory :proposal_feature, class: Decidim::Feature do
+  factory :proposal_feature, parent: :feature do
     name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :proposals).i18n_name }
     manifest_name :proposals
     participatory_process { create(:participatory_process, :with_steps) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 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-01 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-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-results
   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-budgets
   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: A proposals component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -168,7 +168,9 @@ files:
 - app/forms/decidim/proposals/proposal_form.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/proposal_votes_helper.rb
+- app/models/decidim/proposals/abilities/admin_user.rb
 - app/models/decidim/proposals/abilities/current_user.rb
+- app/models/decidim/proposals/abilities/process_admin_user.rb
 - app/models/decidim/proposals/application_record.rb
 - app/models/decidim/proposals/proposal.rb
 - app/models/decidim/proposals/proposal_vote.rb
@@ -186,7 +188,7 @@ files:
 - app/views/decidim/proposals/proposals/_proposal_badge.html.erb
 - app/views/decidim/proposals/proposals/_proposals.html.erb
 - app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb
-- app/views/decidim/proposals/proposals/_share.html.erb
+- app/views/decidim/proposals/proposals/_tags.html.erb
 - app/views/decidim/proposals/proposals/_vote_button.html.erb
 - app/views/decidim/proposals/proposals/_votes_count.html.erb
 - app/views/decidim/proposals/proposals/_votes_limit.html.erb
@@ -199,12 +201,14 @@ files:
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/eu.yml
 - db/migrate/20161212110850_create_decidim_proposals.rb
 - db/migrate/20170112115253_create_proposal_votes.rb
 - db/migrate/20170113114245_add_text_search_indexes.rb
 - db/migrate/20170118120151_add_counter_cache_votes_to_proposals.rb
 - db/migrate/20170120151202_add_user_group_id_to_proposals.rb
 - db/migrate/20170131092413_add_answers_to_proposals.rb
+- db/migrate/20170205082832_add_index_to_decidim_proposals_proposals_proposal_votes_count.rb
 - lib/decidim/proposals.rb
 - lib/decidim/proposals/admin.rb
 - lib/decidim/proposals/admin_engine.rb

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

@@ -1,33 +0,0 @@
-<div class="text-center">
-  <button class="share-link link text-center" data-open="processShare">
-    <%= t(".share") %>
-    <%= icon "share", class: "icon--after"%>
-  </button>
-</div>
-<div class="reveal" id="processShare" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".share") %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="button-group text-center">
-  <%= social_share_button_tag(content_for(:meta_title),
-        url: content_for(:meta_url),
-        image: content_for(:meta_image_url),
-        desc: content_for(:meta_description),
-        via: content_for(:twitter_handler)) %>
-    <a class="button secondary" data-open="urlShare">
-      <%= icon "link-intact" %>
-    </a>
-  </div>
-</div>
-<div class="reveal" id="urlShare" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".share_link") %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <h4 class="heading4"><%= "#{content_for(:meta_url)}" %></h4>
-</div>