decidim-budgets 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7766da6e89e17216f16e9e047f574d40cad89d7
-  data.tar.gz: 3c5ff65d104acc8497d606a3509a167bfb50db74
+  metadata.gz: 902043b0a9c7128da152aea0f90fcb3b36b81eb9
+  data.tar.gz: 1679b08f948a9976585d0a067329c4716dfc2c98
 SHA512:
-  metadata.gz: '09db086aeced3510495a2315772a461d49b56b90afff8bc25dc0f6f782910adf649269b9329ebeffa5bc50f90b7fab8c09bf39e2e6e13e8f58c2df6356781bed'
-  data.tar.gz: 40500928db556a0869d9b275b4b62f6195f81e9852e4caaf5f1b51caf6be6ad390a73e4f4e5529be9d66e5a7f6ac07b33a9bce6dc4f14082c4f8b5273a6a03b1
+  metadata.gz: 46807e1aab8ca99f335df5640e53b8a7d34326590c7c8a08f2e84c430e61ebdb87bf2fac239fc67491eb59cbf1305257fa87607277a509996411006afcfd2540
+  data.tar.gz: 8fcbf00d7f4fb3045e44c839c99859a64aae86c0b7569c5acd4e9479090f6189ff943ee8546384097464e2097dd7802250afb97df21c38ca60174e6df2eb3651

data/app/controllers/decidim/budgets/application_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Components::BaseController`, which
+    # Note that it inherits from `Decidim::Features::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
     end

data/app/models/decidim/budgets/line_item.rb

@@ -8,8 +8,7 @@ module Decidim
       belongs_to :order, class_name: "Decidim::Budgets::Order", foreign_key: "decidim_order_id"
       belongs_to :project, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
 
-      validates :order, presence: true, uniqueness: { scope: :project }
-      validates :project, presence: true
+      validates :order, uniqueness: { scope: :project }
       validate :same_feature
 
       def same_feature

data/app/models/decidim/budgets/order.rb

@@ -11,10 +11,10 @@ module Decidim
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id"
 
-      has_many :projects, through: :line_items, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
       has_many :line_items, class_name: "Decidim::Budgets::LineItem", foreign_key: "decidim_order_id", dependent: :destroy
+      has_many :projects, through: :line_items, class_name: "Decidim::Budgets::Project", foreign_key: "decidim_project_id"
 
-      validates :user, presence: true, uniqueness: { scope: :feature }
+      validates :user, uniqueness: { scope: :feature }
       validate :user_belongs_to_organization
 
       validates :total_budget, numericality: {

data/app/views/decidim/budgets/projects/_linked_projects.html.erb

@@ -2,7 +2,7 @@
   <% resources.each do |project| %>
     <div class="card--list__item">
       <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
-      <%= link_to decidim_resource_path(project), class: "card--list__text card__link card__link--block" do %>
+      <%= link_to resource_locator(project).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(project.title) %>
         </h5>

data/config/locales/it.yml

@@ -0,0 +1,126 @@
+it:
+  activemodel:
+    attributes:
+      project:
+        decidim_category_id: Categoria
+        decidim_scope_id: Visibilità/ambito
+        description: Descrizione
+        proposal_ids: Proposte correlate
+        title: Titolo
+  decidim:
+    budgets:
+      actions:
+        attachments: Allegati
+        confirm_destroy: Sei certo di voler cancellare questo progetto?
+        destroy: Cancella
+        edit: Modifica
+        new: Nuovo
+        preview: Anteprima
+        title: Azioni
+      admin:
+        models:
+          project:
+            name: Progetto
+        projects:
+          create:
+            invalid: C'è stato un problema durante la creazione di questo progetto.
+            success: OK, progetto creato.
+          destroy:
+            success: OK, progetto eliminato.
+          edit:
+            title: Modifica il progetto
+            update: Aggiorna
+          index:
+            finished_orders: Ordini terminati.
+            pending_orders: Ordini pendenti.
+            title: Progetti
+          new:
+            create: Crea
+            title: Nuovo risultato
+          update:
+            invalid: C'è stato un problema durante l'aggiornamento di questo progetto.
+            success: OK, progetto aggiornato.
+      models:
+        project:
+          fields:
+            title: Titolo
+      projects:
+        budget_confirm:
+          are_you_sure: Sei d'accordo? Dopo che avrai confermato il tuo voto non potrai più modificarlo
+          cancel: Annulla
+          confirm: Conferma
+          description: Questi sono i progetti per i quali hai scelto di partecipare al budget.
+          title: Conferma il voto
+        budget_excess:
+          close: Chiudi
+          description: Questo progetto supera il budget e non può essere aggiunto. Se vuoi puoi cancellare un progetto che hai già scelto di aggiungere, oppure votare in base alle tue preferenze.
+          title: Budget superato
+        budget_summary:
+          are_you_sure: Sei certo di voler cancellare il tuo voto?
+          assigned: 'Assegnato:'
+          cancel_order: Cancella il tuo voto e ricomincia.
+          checked_out:
+            description: Hai già votato per il budget. Se hai cambiato idea puoi %{cancel_link}.
+            title: Voto di budget completato.
+          description: Per quali progetti pensi che dovremmo allocare del budget? Indica un budget minimo di %{minimum_budget} ai progetti che vuoi votare e vota con le tue preferenze per definire il budget.
+          title: Tu decidi il budget
+        count:
+          projects_count:
+            one: 1 progetto
+            other: "%{count} progetti"
+        filters:
+          category: Categoria
+          category_prompt: Scegli una categoria
+          scopes: Visibilità/ambito
+          search: Cerca
+        filters_small_view:
+          close_modal: Chiudi modalità
+          filter: Filtra
+          filter_by: Filtra per
+          unfold: Espandi
+        order_progress:
+          vote: Vota
+        order_selected_projects:
+          remove: Rimuovi
+          selected_projects:
+            one: Progetto scelto
+            other: Progetti scelti
+          view: Visualizza
+        project:
+          add: Aggiungi
+          count:
+            one: 1 supporto/voto
+            other: "%{count} supportati/voti"
+          remove: Elimina
+        project_budget_button:
+          add: Aggiungi
+          added: Aggiunto
+        show:
+          view_all_projects: Visualizza tutti i progetti
+    features:
+      budgets:
+        actions:
+          vote: Votazione
+        name: Investimenti
+        settings:
+          global:
+            comments_enabled: Commenti abilitati
+            total_budget: Budget totale
+            vote_threshold_percent: Soglia voti (percentuale)
+          step:
+            comments_blocked: Commenti bloccati
+            show_votes: Visualizza voti
+            votes_enabled: Voti abilitati
+    orders:
+      checkout:
+        error: C'è stato un errore durante l'acquisizione del voto.
+        success: OK, il tuo voto è stato acquisito.
+      destroy:
+        error: C'è stato un errore durante la cancellazione del voto.
+        success: OK, il tuo voto è stato cancellato.
+    resource_links:
+      included_proposals:
+        project_proposals: 'Proposte incluse in questo progetto:'
+  index:
+    confirmed_orders_count: Conteggio ordini
+  total_budget: Budget totale

data/db/migrate/20170127114122_create_projects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateProjects < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_budgets_projects do |t|

data/db/migrate/20170130095615_create_orders.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateOrders < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_budgets_orders do |t|

data/db/migrate/20170130101825_create_line_items.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateLineItems < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_budgets_line_items do |t|

data/db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveShortDescriptionFromDecidimProjects < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_budgets_projects, :short_description

data/db/migrate/20170215132708_add_reference_to_projects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferenceToProjects < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_budgets_projects, :reference, :string

data/db/migrate/20170410074214_remove_not_null_reference_budgets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveNotNullReferenceBudgets < ActiveRecord::Migration[5.0]
   def change
     change_column_null :decidim_budgets_projects, :reference, true

data/db/migrate/20170612101846_migrate_projects_category.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MigrateProjectsCategory < ActiveRecord::Migration[5.1]
+  def change
+    # Create categorizations ensuring database integrity
+    execute('
+      INSERT INTO decidim_categorizations(decidim_category_id, categorizable_id, categorizable_type, created_at, updated_at)
+        SELECT decidim_category_id, decidim_budgets_projects.id, \'Decidim::Budgets::Project\', NOW(), NOW()
+        FROM decidim_budgets_projects
+        INNER JOIN decidim_categories ON decidim_categories.id = decidim_budgets_projects.decidim_category_id
+    ')
+    # Remove unused column
+    remove_column :decidim_budgets_projects, :decidim_category_id
+  end
+end

data/lib/decidim/budgets/feature.rb

@@ -65,13 +65,13 @@ Decidim.register_feature(:budgets) do |feature|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
+          file: File.new(File.join(__dir__, "seeds", "city.jpeg")),
           attached_to: project
         )
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(File.dirname(__FILE__), "seeds", "Exampledocument.pdf")),
+          file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
           attached_to: project
         )
         Decidim::Comments::Seed.comments_for(project)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-16 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.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,42 +88,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: A budgets component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -195,6 +195,7 @@ files:
 - config/locales/eu.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/nl.yml
 - db/migrate/20170127114122_create_projects.rb
 - db/migrate/20170130095615_create_orders.rb
@@ -202,6 +203,7 @@ files:
 - db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb
 - db/migrate/20170215132708_add_reference_to_projects.rb
 - db/migrate/20170410074214_remove_not_null_reference_budgets.rb
+- db/migrate/20170612101846_migrate_projects_category.rb
 - lib/decidim/budgets.rb
 - lib/decidim/budgets/admin.rb
 - lib/decidim/budgets/admin_engine.rb