decidim-budgets 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b4f968329a7f43876f3fdcbdf88806f342de5961a389dc4d8524e6b007a4c5
-  data.tar.gz: 78482327631965ea3c5e91ca019aacf783775d2814aec6a985d3b048e40f8697
+  metadata.gz: 26b0f42475f4913d1bd2e6b08236aa7b13164d9930e2ba11a1223ce23db47f17
+  data.tar.gz: 99d67d115391105cfb7bf1d2c14c06afb530386dbbce84dfa048920ff5fd6c11
 SHA512:
-  metadata.gz: 014affe9f34987375725e72a48ec3df49b889e45717afaac62111b857bf1cb82e0acd84bfb28ee5b01bf8330275e279236be6a18f3051541b0386f161bcf73d9
-  data.tar.gz: 1be54f8432b0d7a4efc80e45c428ea6601aa5c1ecb954dd61d97039ba4f4de5f61b4d581aa7f7744c4caeebedd77c6810a4c40adda69bbd44fe82b1a646938b9
+  metadata.gz: 63e5247cb648cc220aca7725588e0b3e1441b2813b3baae6d470f8ce2bacf875718c54874847177a9f80b304a143189de8d893e52e1217d17de4f1d989858830
+  data.tar.gz: 79e7482532f355825685c77ca2244279c2eaba14b2930dd5ae601507595ab3ce55f8de52194c3c560c89bceb36a9dbc51dab94a3f37599dcc82317082d33098c

data/app/assets/javascripts/decidim/budgets/progressFixed.js.es6

@@ -1,8 +1,8 @@
 $(() => {
   const checkProgressPosition = () => {
     let progressFix = document.querySelector("[data-progressbox-fixed]"),
-      progressRef = document.querySelector("[data-progress-reference]"),
-      progressVisibleClass = "is-progressbox-visible";
+        progressRef = document.querySelector("[data-progress-reference]"),
+        progressVisibleClass = "is-progressbox-visible";
 
     if (!progressRef) {
       return;

data/app/commands/decidim/budgets/admin/update_project.rb

@@ -34,7 +34,7 @@ module Decidim
         attr_reader :project, :form
 
         def update_project
-          project.update_attributes!(
+          project.update!(
             scope: form.scope,
             category: form.category,
             title: form.title,

data/app/controllers/decidim/budgets/admin/attachment_collections_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # Controller that allows managing all the attachment collections for a budget.
+      #
+      class AttachmentCollectionsController < Admin::ApplicationController
+        include Decidim::Admin::Concerns::HasAttachmentCollections
+
+        def after_destroy_path
+          project_attachment_collections_path(project, project.feature, current_participatory_space)
+        end
+
+        def collection_for
+          project
+        end
+
+        def project
+          @project ||= projects.find(params[:project_id])
+        end
+
+        def authorization_object
+          project.feature
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/budgets/admin/project_form.rb

@@ -22,7 +22,8 @@ module Decidim
 
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
-        validate { errors.add(:decidim_scope_id, :invalid) if current_participatory_space&.scope && !current_participatory_space&.scope&.ancestor_of?(scope) }
+
+        validate :scope_belongs_to_participatory_space_scope
 
         delegate :categories, to: :current_feature
 
@@ -49,7 +50,7 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_feature.scopes.find_by(id: @decidim_scope_id) : current_participatory_space&.scope
+          @scope ||= @decidim_scope_id ? current_participatory_space.scopes.find_by(id: @decidim_scope_id) : current_participatory_space.scope
         end
 
         # Scope identifier
@@ -58,6 +59,12 @@ module Decidim
         def decidim_scope_id
           @decidim_scope_id || scope&.id
         end
+
+        private
+
+        def scope_belongs_to_participatory_space_scope
+          errors.add(:decidim_scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
+        end
       end
     end
   end

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

@@ -63,6 +63,8 @@ module Decidim
       private
 
       def user_belongs_to_organization
+        organization = feature&.organization
+
         return if !user || !organization
         errors.add(:user, :invalid) unless user.organization == organization
       end

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

@@ -7,9 +7,10 @@ module Decidim
     class Project < Budgets::ApplicationRecord
       include Decidim::Resourceable
       include Decidim::HasFeature
-      include Decidim::HasScope
+      include Decidim::ScopableFeature
       include Decidim::HasCategory
       include Decidim::HasAttachments
+      include Decidim::HasAttachmentCollections
       include Decidim::HasReference
       include Decidim::Followable
       include Decidim::Comments::Commentable

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

@@ -22,7 +22,7 @@ module Decidim
 
       # Returns the random projects for the current page.
       def results
-        @projects ||= Project.transaction do
+        @results ||= Project.transaction do
           Project.connection.execute("SELECT setseed(#{Project.connection.quote(random_seed)})")
           super.reorder("RANDOM()").load
         end

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

@@ -32,6 +32,10 @@
                   <%= icon_link_to "pencil", edit_project_path(project), t("actions.edit", scope: "decidim.budgets"), class: "action-icon--edit" %>
                 <% end %>
 
+                <% if can? :update, current_feature %>
+                    <%= icon_link_to "folder", project_attachment_collections_path(project), t("actions.attachment_collections", scope: "decidim.budgets"), class: "action-icon--attachment_collections" %>
+                <% end %>
+
                 <% if can? :update, current_feature %>
                   <%= icon_link_to "paperclip", project_attachments_path(project), t("actions.attachments", scope: "decidim.budgets"), class: "action-icon--attachments" %>
                 <% end %>

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

@@ -33,7 +33,7 @@
         <%= render partial: "decidim/shared/follow_button", locals: { followable: project } %>
       </div>
     </div>
-    <%= feature_reference(project) %>
+    <%= resource_reference(project) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">

data/config/locales/ca.yml

@@ -11,6 +11,7 @@ ca:
   decidim:
     budgets:
       actions:
+        attachment_collections: Col·leccions
         attachments: Adjunts
         confirm_destroy: Segur que vols eliminar aquest projecte?
         destroy: Esborrar

data/config/locales/en.yml

@@ -12,6 +12,7 @@ en:
   decidim:
     budgets:
       actions:
+        attachment_collections: Collections
         attachments: Attachments
         confirm_destroy: Are you sure you want to delete this project?
         destroy: Delete

data/config/locales/es.yml

@@ -11,6 +11,7 @@ es:
   decidim:
     budgets:
       actions:
+        attachment_collections: Colecciones
         attachments: Archivos adjuntos
         confirm_destroy: '¿Estás seguro de que deseas eliminar este proyecto?'
         destroy: Borrar

data/config/locales/eu.yml

@@ -11,6 +11,7 @@ eu:
   decidim:
     budgets:
       actions:
+        attachment_collections: Bilduma
         attachments: Fitxategi erantsiak
         confirm_destroy: Ziur zaude proiektu hau ezabatu nahi duzula?
         destroy: Ezabatu

data/config/locales/fi.yml

@@ -11,6 +11,7 @@ fi:
   decidim:
     budgets:
       actions:
+        attachment_collections: kokoelmat
         attachments: Liitteet
         confirm_destroy: Haluatko varmasti poistaa tämän projektin?
         destroy: Poista

data/config/locales/fr.yml

@@ -11,6 +11,7 @@ fr:
   decidim:
     budgets:
       actions:
+        attachment_collections: Collections
         attachments: Pièces jointes
         confirm_destroy: Êtes-vous certain de vouloir supprimer ce projet?
         destroy: Supprimer

data/config/locales/gl.yml

@@ -11,6 +11,7 @@ gl:
   decidim:
     budgets:
       actions:
+        attachment_collections: Coleccións
         attachments: Anexos
         confirm_destroy: Estás seguro de que queres eliminar este proxecto?
         destroy: Eliminar

data/config/locales/it.yml

@@ -11,6 +11,7 @@ it:
   decidim:
     budgets:
       actions:
+        attachment_collections: collezioni
         attachments: Allegati
         confirm_destroy: Sei certo di voler cancellare questo progetto?
         destroy: Cancella

data/config/locales/nl.yml

@@ -11,6 +11,7 @@ nl:
   decidim:
     budgets:
       actions:
+        attachment_collections: collecties
         attachments: Bijlagen
         confirm_destroy: Weet u zeker dat u dit project wilt verwijderen?
         destroy: Verwijderen

data/config/locales/pl.yml

@@ -11,6 +11,7 @@ pl:
   decidim:
     budgets:
       actions:
+        attachment_collections: Kolekcje
         attachments: Załączniki
         confirm_destroy: Czy na pewno chcesz usunąć ten projekt?
         destroy: Kasować
@@ -66,11 +67,6 @@ pl:
             title: Ukończono budżet budżetowy
           description: Jakie projekty myślisz, powinniśmy przeznaczyć budżet? Przyznaj co najmniej %{minimum_budget} projekty, które chcesz i głosuj zgodnie z Twoimi preferencjami, aby określić budżet.
           title: Ty decydujesz budżet
-        count:
-          projects_count:
-            one: 1 projekt
-            few: "%{count} projektów"
-            other: "%{count} projektów"
         filters:
           category: Kategoria
           category_prompt: Wybierz kategorię
@@ -84,17 +80,9 @@ pl:
           vote: Głosować
         order_selected_projects:
           remove: Usunąć
-          selected_projects:
-            one: Wybrany projekt
-            few: Wybranych projektów
-            other: Wybranych projektów
           view: Widok
         project:
           add: Dodaj
-          count:
-            one: 1
-            few: "%{count} obsługuje"
-            other: "%{count} obsługuje"
           remove: Usunąć
         project_budget_button:
           add: Dodaj

data/config/locales/pt-BR.yml

@@ -11,6 +11,7 @@ pt-BR:
   decidim:
     budgets:
       actions:
+        attachment_collections: Coleções
         attachments: Anexos
         confirm_destroy: Tem certeza de que deseja excluir esse projeto?
         destroy: Excluir

data/config/locales/pt.yml

@@ -11,6 +11,7 @@ pt:
   decidim:
     budgets:
       actions:
+        attachment_collections: Coleções
         attachments: Anexos
         confirm_destroy: Tem certeza de que deseja excluir esse projeto?
         destroy: Excluir

data/config/locales/sv.yml

@@ -11,6 +11,7 @@ sv:
   decidim:
     budgets:
       actions:
+        attachment_collections: samlingar
         attachments: bilagor
         confirm_destroy: Är du säker på att du vill radera detta projekt?
         destroy: Radera

data/config/locales/uk.yml

@@ -7,10 +7,11 @@ uk:
         decidim_scope_id: Терен
         description: Опис
         proposal_ids: Супутні пропозиції
-        title: Назва
+        title: Заголовок
   decidim:
     budgets:
       actions:
+        attachment_collections: Збірки
         attachments: Вкладені файли
         confirm_destroy: Ви дійсно бажаєте видалити цей проект?
         destroy: Видалити
@@ -44,7 +45,7 @@ uk:
       models:
         project:
           fields:
-            title: Назва
+            title: Заголовок
       projects:
         budget_confirm:
           are_you_sure: Чи ви згодні? Підтвердивши свій голос, ви не зможете його потім змінити.

data/lib/decidim/budgets/admin_engine.rb

@@ -12,6 +12,7 @@ module Decidim
 
       routes do
         resources :projects do
+          resources :attachment_collections
           resources :attachments
         end
 

data/lib/decidim/budgets/feature.rb

@@ -68,6 +68,20 @@ Decidim.register_feature(:budgets) do |feature|
         end,
         budget: Faker::Number.number(8)
       )
+
+      attachment_collection = Decidim::AttachmentCollection.create!(
+        name: Decidim::Faker::Localized.word,
+        description: Decidim::Faker::Localized.sentence(5),
+        collection_for: project
+      )
+
+      Decidim::Attachment.create!(
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.sentence(5),
+        file: File.new(File.join(__dir__, "seeds", "Exampledocument.pdf")),
+        attachment_collection: attachment_collection,
+        attached_to: project
+      )
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.9.3"
+      "0.10.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -74,42 +74,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.10.0
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -137,6 +137,7 @@ files:
 - app/commands/decidim/budgets/remove_line_item.rb
 - app/controllers/concerns/decidim/budgets/needs_current_order.rb
 - app/controllers/decidim/budgets/admin/application_controller.rb
+- app/controllers/decidim/budgets/admin/attachment_collections_controller.rb
 - app/controllers/decidim/budgets/admin/attachments_controller.rb
 - app/controllers/decidim/budgets/admin/projects_controller.rb
 - app/controllers/decidim/budgets/application_controller.rb
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim budgets module