decidim 0.0.3 → 0.0.4

data/decidim-budgets/app/services/decidim/budgets/project_search.rb

@@ -17,7 +17,6 @@ module Decidim
         query
           .where(localized_search_text_in(:title), text: "%#{search_text}%")
           .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
-          .or(query.where(localized_search_text_in(:short_description), text: "%#{search_text}%"))
       end
 
       # Handle the scope_id filter

data/decidim-budgets/app/views/decidim/budgets/admin/projects/_form.html.erb

@@ -2,10 +2,6 @@
   <%= form.translated :text_field, :title, autofocus: true %>
 </div>
 
-<div class="field" >
-  <%= form.translated :editor, :short_description %>
-</div>
-
 <div class="field" >
   <%= form.translated :editor, :description %>
 </div>

data/decidim-budgets/app/views/decidim/budgets/admin/projects/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/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -19,6 +19,7 @@
         </td>
         <td class="actions">
           <%= link_to t("actions.edit", scope: "decidim.budgets"), edit_project_path(project) if can? :update, current_feature %>
+          <%= link_to t("actions.attachments", scope: "decidim.budgets"), project_attachments_path(project) if can? :update, current_feature %>
           <%= link_to t("actions.destroy", scope: "decidim.budgets"), project_path(project), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.budgets") } if can? :destroy, current_feature %>
         </td>
       </tr>

data/decidim-budgets/app/views/decidim/budgets/admin/projects/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/decidim-budgets/app/views/decidim/budgets/line_items/update_budget.js.erb

@@ -19,3 +19,5 @@ if ($projectItem.length > 0) {
 if ($projectBudgetButton.length > 0) {
   $projectBudgetButton.html('<%= j(render partial: 'decidim/budgets/projects/project_budget_button', locals: { project: project }) %>');
 }
+
+window.DecidimBudgets.checkProgressPosition();

data/decidim-budgets/app/views/decidim/budgets/projects/_project.html.erb

@@ -14,7 +14,7 @@
       <span class="card--list__data__number budget-list__number">
         <%= budget_to_currency(project.budget) %>
       </span>
-      <%= button_to order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button tiny budget--list__action success" do %>
+      <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button tiny budget--list__action success" do %>
         <%= icon("check", class: "icon--small", aria_label: t('.remove'), role: "img") %>
       <% end %>
     </div>
@@ -23,7 +23,7 @@
       <span class="card--list__data__number budget-list__number">
         <%= budget_to_currency(project.budget) %>
       </span>
-      <%= button_to order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
+      <%= action_authorized_button_to "vote", order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button tiny hollow budget--list__action" do %>
         <%= icon("check", class: "icon--small", aria_label: t('.add'), role: "img") %>
       <% end %>
     </div>

data/decidim-budgets/app/views/decidim/budgets/projects/_project_budget_button.html.erb

@@ -1,8 +1,8 @@
 <% if current_user.present? %>
   <% if current_order && current_order.projects.include?(project) %>
-    <%= button_to t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
+    <%= action_authorized_button_to "vote", t('.added'), order_line_item_path(project_id: project), method: :delete, remote: true, data: { disable: true, budget: project.budget }, disabled: current_order_checked_out?, class: "button expanded button--sc success budget--list__action" %>
   <% else %>
-    <%= button_to t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
+    <%= action_authorized_button_to "vote", t('.add'), order_line_item_path(project_id: project), method: :post, remote: true, data: { disable: true, budget: project.budget, add: true }, disabled: current_order_checked_out?, class: "button expanded button--sc budget--list__action" %>
   <% end %>
 <% else %>
   <button class="button expanded button--sc disabled" data-toggle="loginModal"><%= t('.add') %></button>

data/decidim-budgets/app/views/decidim/budgets/projects/index.html.erb

@@ -1,4 +1,6 @@
-<% content_for(:title, t(".title")) %>
+<% add_meta_tags({
+  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
+}) %>
 
 <% if current_user.present? %>
   <div class="row column">
@@ -23,4 +25,3 @@
 
 <%= javascript_include_tag("decidim/filters") %>
 <%= javascript_include_tag("decidim/budgets/projects") %>
-<%= render partial: "decidim/shared/login_modal" %>

data/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb

@@ -1,4 +1,4 @@
-<% content_for(:title, translated_attribute(project.title)) %>
+<% provide(:title, translated_attribute(project.title)) %>
 
 <div class="row column view-header">
   <% if current_user.present? %>
@@ -27,12 +27,8 @@
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
-      <%== translated_attribute project.short_description %>
-      <%= render partial: "tags", locals: { project: project } %>
-    </div>
-    <div class="section">
-      <h3 class="section-heading"><%= t(".project_description") %></h3>
       <%== translated_attribute project.description %>
+      <%= render partial: "tags", locals: { project: project } %>
     </div>
     <%= linked_resources_for project, :proposals, "included_proposals" %>
   </div>
@@ -44,5 +40,5 @@
   <% end %>
 <% end %>
 
+<%= attachments_for project %>
 <%= javascript_include_tag("decidim/budgets/projects") %>
-<%= render partial: "decidim/shared/login_modal" %>

data/decidim-budgets/config/i18n-tasks.yml

@@ -2,3 +2,4 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.budgets.name"
+- "activemodel.attributes.project.*"

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

@@ -1,7 +1,17 @@
 ca:
+  activemodel:
+    attributes:
+      project:
+        budget: Pressupost
+        decidim_category_id: Categoria
+        decidim_scope_id: Àmbit
+        description: Descripció
+        proposal_ids: Propostes relacionades
+        title: Títol
   decidim:
     budgets:
       actions:
+        attachments: Adjunts
         confirm_destroy: Estàs segur que vols eliminar aquest projecte?
         destroy: Esborrar
         edit: Editar
@@ -15,6 +25,8 @@ ca:
           create:
             invalid: Hi ha hagut un problema creant aquest projecte
             success: Projecte creat correctament
+          destroy:
+            success: Projecte eliminat correctament
           edit:
             title: Editar projecte
             update: Actualitzar projecte
@@ -32,7 +44,7 @@ ca:
             title: Títol
       projects:
         budget_confirm:
-          are_you_sure: Estàs d'acord? Un cop hagis confirmat el teu vot, no podràs canviar-lo.
+          are_you_sure: Hi estàs d'acord? Un cop hagis confirmat el teu vot, no podràs canviar-lo.
           cancel: Cancel·lar
           confirm: Confirmar
           description: Aquests són els projectes que has seleccionat per formar part del pressupost.
@@ -43,12 +55,13 @@ ca:
           ok: D'acord
           title: Pressupost superat
         budget_summary:
+          are_you_sure: Estàs segur de que vols cancel·lar el teu vot?
           assigned: 'Assignat:'
           cancel_order: eliminar el teu vot i començar de nou
           checked_out:
-            description: Ja has votat pel pressupost. Si ha canviat d'idea, pots %{cancel_link}.
+            description: Ja has votat pel pressupost. Si has canviat d'idea, pots %{cancel_link}.
             title: Vot pels pressupostos completat
-          description: "En quins projectes creus que hem de destinar el pressupost? Has d'assignar com a mínim %{minimum_budget} als projectes que desitges i votar amb les teves preferències per definir el pressupost."
+          description: En quins projectes creus que hem de destinar el pressupost? Has d'assignar com a mínim %{minimum_budget} als projectes que desitges i votar amb les teves preferències per definir el pressupost.
           title: Tu decideixes el pressupost
         count:
           projects_count:
@@ -59,7 +72,7 @@ ca:
           scopes: Àmbits
           search: Cerca
         index:
-          title: Títol
+          meta_title: "%{feature_name}"
         order_progress:
           vote: Votar
         order_selected_projects:
@@ -76,9 +89,15 @@ ca:
           added: Afegit
         show:
           budget: Pressupost
-          project_description: Descripció del projecte
           view_all_projects: Veure tots els projectes
     features:
       budgets:
         name: Pressupostos
+    orders:
+      checkout:
+        error: S'ha produït un error en processar el teu vot
+        success: El teu vot s'ha tramitat amb èxit
+      destroy:
+        error: S'ha produït un error en cancel·lar el seu vot
+        success: El seu vot ha estat cancel·lat correctament
   total_budget: Pressupost total

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

@@ -1,8 +1,18 @@
 ---
 en:
+  activemodel:
+    attributes:
+      project:
+        budget: Budget
+        decidim_category_id: Category
+        decidim_scope_id: Scope
+        description: Description
+        proposal_ids: Related proposals
+        title: Title
   decidim:
     budgets:
       actions:
+        attachments: Attachments
         confirm_destroy: Are you sure you want to delete this project?
         destroy: Delete
         edit: Edit
@@ -52,7 +62,7 @@ en:
           checked_out:
             description: You've already voted for the budget. If you've changed your mind, you can %{cancel_link}.
             title: Budget vote completed
-          description: "What projects do you think we should allocate budget for? Assign at least %{minimum_budget} to the projects you want and vote with your preferences to define the budget."
+          description: What projects do you think we should allocate budget for? Assign at least %{minimum_budget} to the projects you want and vote with your preferences to define the budget.
           title: You decide the budget
         count:
           projects_count:
@@ -63,7 +73,7 @@ en:
           scopes: Scopes
           search: Search
         index:
-          title: Title
+          meta_title: "%{feature_name}"
         order_progress:
           vote: Vote
         order_selected_projects:
@@ -80,7 +90,6 @@ en:
           added: Added
         show:
           budget: Budget
-          project_description: Project description
           view_all_projects: View all projects
     features:
       budgets:

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

@@ -1,7 +1,17 @@
 es:
+  activemodel:
+    attributes:
+      project:
+        budget: Presupuesto
+        decidim_category_id: Categoría
+        decidim_scope_id: Ámbito
+        description: Descripción
+        proposal_ids: Propuestas relacionadas
+        title: Título
   decidim:
     budgets:
       actions:
+        attachments: Archivos adjuntos
         confirm_destroy: '¿Estás seguro de que deseas eliminar este proyecto?'
         destroy: Borrar
         edit: Editar
@@ -15,6 +25,8 @@ es:
           create:
             invalid: Ha habido un problema al crear este proyecto
             success: Proyecto creado con éxito
+          destroy:
+            success: Proyecto eliminado exitosamente
           edit:
             title: Editar proyecto
             update: Actualizar proyecto
@@ -43,12 +55,13 @@ es:
           ok: De acuerdo
           title: Presupuesto excedido
         budget_summary:
+          are_you_sure: '¿Estás seguro de que deseas cancelar tu voto?'
           assigned: 'Asignado:'
           cancel_order: eliminar tu voto y empezar de nuevo
           checked_out:
             description: Ya has votado para el presupuesto. Si has cambiado de idea, puedes %{cancel_link}.
             title: Voto enviado correctamente
-          description: "¿Qué proyectos crees que deberíamos asignar el presupuesto? Asigna por lo menos %{minimum_budget} a los proyectos que desees y vota para definir el presupuesto."
+          description: '¿Qué proyectos crees que deberíamos asignar el presupuesto? Asigna por lo menos %{minimum_budget} a los proyectos que desees y vota para definir el presupuesto.'
           title: Tú decides el presupuesto
         count:
           projects_count:
@@ -59,7 +72,7 @@ es:
           scopes: Ámbitos
           search: Buscar
         index:
-          title: Título
+          meta_title: "%{feature_name}"
         order_progress:
           vote: Votar
         order_selected_projects:
@@ -76,9 +89,15 @@ es:
           added: Añadido
         show:
           budget: Presupuesto
-          project_description: Descripción del proyecto
           view_all_projects: Ver todos los proyectos
     features:
       budgets:
         name: Presupuestos
+    orders:
+      checkout:
+        error: Se ha producido un error al procesar tu voto
+        success: Tu voto se ha tramitado con éxito
+      destroy:
+        error: Ha habido un error al cancelar tu voto
+        success: Tu voto ha sido cancelado correctamente
   total_budget: Presupuesto total

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

@@ -0,0 +1,5 @@
+eu:
+  activemodel:
+    attributes:
+      project:
+        budget: Aurrekontua

data/decidim-budgets/db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb

@@ -0,0 +1,5 @@
+class RemoveShortDescriptionFromDecidimProjects < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :decidim_budgets_projects, :short_description
+  end
+end

data/decidim-budgets/decidim-budgets.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-proposals", Decidim.version
+  s.add_development_dependency "decidim-admin", Decidim.version
 end

data/decidim-budgets/lib/decidim/budgets/admin_engine.rb

@@ -10,7 +10,10 @@ module Decidim
       paths["db/migrate"] = nil
 
       routes do
-        resources :projects
+        resources :projects do
+          resources :attachments
+        end
+
         root to: "projects#index"
       end
 

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

@@ -8,6 +8,8 @@ Decidim.register_feature(:budgets) do |feature|
   feature.icon = "decidim/budgets/icon.svg"
   feature.stylesheet = "decidim/budgets/budgets"
 
+  feature.actions = %(vote)
+
   feature.on(:before_destroy) do |instance|
     raise StandardError, "Can't remove this feature" if Decidim::Budgets::Project.where(feature: instance).any?
   end
@@ -34,6 +36,7 @@ Decidim.register_feature(:budgets) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :budgets).i18n_name,
         manifest_name: :budgets,
+        published_at: Time.current,
         participatory_process: process
       )
 
@@ -46,12 +49,20 @@ Decidim.register_feature(:budgets) do |feature|
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(3)
           end,
-          short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
-          end,
           budget: Faker::Number.number(8)
         )
-
+        Decidim::Attachment.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          file: File.new(Decidim::Dev.asset("city.jpeg")),
+          attached_to: project
+        )
+        Decidim::Attachment.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          file: File.new(Decidim::Dev.asset("Exampledocument.pdf")),
+          attached_to: project
+        )
         Decidim::Comments::Seed.comments_for(project)
       end
     end

data/decidim-budgets/lib/decidim/budgets/test/factories.rb

@@ -3,7 +3,7 @@ require "decidim/faker/localized"
 require "decidim/dev"
 
 FactoryGirl.define do
-  factory :budget_feature, class: Decidim::Feature do
+  factory :budget_feature, parent: :feature do
     name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :budgets).i18n_name }
     manifest_name :budgets
     participatory_process
@@ -26,9 +26,8 @@ FactoryGirl.define do
   factory :project, class: Decidim::Budgets::Project do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
     budget { Faker::Number.number(8) }
-    feature { create(:budget_feature) }    
+    feature { create(:budget_feature) }
   end
 
   factory :order, class: Decidim::Budgets::Order do

data/decidim-budgets/spec/commands/create_project_spec.rb

@@ -21,7 +21,6 @@ describe Decidim::Budgets::Admin::CreateProject do
       :invalid? => invalid,
       title: {en: "title"},
       description: {en: "description"},
-      short_description: {en: "short_description"},
       budget: 10_000_000,
       proposal_ids: proposals.map(&:id),
       scope: scope,

data/decidim-budgets/spec/commands/update_project_spec.rb

@@ -21,7 +21,6 @@ describe Decidim::Budgets::Admin::UpdateProject do
       :invalid? => invalid,
       title: {en: "title"},
       description: {en: "description"},
-      short_description: {en: "short_description"},
       budget: 10_000_000,
       proposal_ids: proposals.map(&:id),
       scope: scope,

data/decidim-budgets/spec/features/admin_manages_project_attachments_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require_relative "../shared/admin_shared_context"
+require_relative "../shared/manage_attachments_examples"
+
+describe "Admin manages project attachments", type: :feature do
+  include_context "admin"
+  it_behaves_like "manage project attachments"
+end