decidim-budgets 0.32.0.rc2 → 0.32.0.rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/budgets/budget_list_item_cell.rb +12 -6
  3. data/app/forms/decidim/budgets/admin/project_import_proposals_form.rb +13 -0
  4. data/app/views/decidim/budgets/admin/projects/_actions.html.erb +1 -1
  5. data/decidim-budgets.gemspec +1 -1
  6. data/lib/decidim/budgets/version.rb +1 -1
  7. metadata +11 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e182cb3a70084757f0bee78f74f983d010832e8f8f63cf458e1c84c5745ad809
4
- data.tar.gz: 7a4f6d7040b315631962341dae41a29665aa7aa336dba03969c2bd411ea58db9
3
+ metadata.gz: 58f2d3342c6ee824006714552a5c4f4e369f136122cd9da281188862cf7aca3e
4
+ data.tar.gz: '087df066d4ccf7d5346dd452679e7bb8d802a1a7642cbb24d11566397de12e94'
5
5
  SHA512:
6
- metadata.gz: 4bec012a99f9236313015e12a62296cafdd626af256d42a876e8a4402f0a7fe4fbbb5cf096c300c4770cab545fb6a90f31b24177b44cd7037fb5592cd0da026c
7
- data.tar.gz: 7fe6a81c51665714a5e47886561de9f8702076405890fb7c1f87f49fd071f0025c1f47605cbf12ec104ca494016d83f17b295710a9103adbcb621d717f46c680
6
+ metadata.gz: e8dbdb4ea640ad51034746481eb4da549eef64a0910f43ba7391994a315786ba98f73cc524c97dfaf7031d6c1a196d727d72e73035b371a926cc3c683f6d7d49
7
+ data.tar.gz: a35f0559d0432825b263c7d1cc9f60fade19eb554a4a72970406f5f88d47701eaa46825e72344e97943cffcc40772ef07f039ea1b07ab93e488d57327b792376
data/app/cells/decidim/budgets/budget_list_item_cell.rb CHANGED
@@ -47,12 +47,18 @@ module Decidim
47
47
  # If not (i.e. voting is disabled or finished), then link to the resource itself
48
48
  def link_to_resource_or_vote(css_class)
49
49
  if voting_open?
50
- action_authorized_link_to "vote",
51
- budget_projects_path(budget, start_voting: true),
52
- resource: budget,
53
- data: { "redirect-url": budget_projects_path(budget) },
54
- class: css_class do
55
- yield
50
+ if current_user
51
+ action_authorized_link_to :vote,
52
+ budget_projects_path(budget, start_voting: true),
53
+ resource: budget,
54
+ class: css_class,
55
+ data: { "redirect-url": budget_projects_path(budget) } do
56
+ yield
57
+ end
58
+ else
59
+ link_to budget_projects_path(budget, start_voting: true), class: css_class do
60
+ yield
61
+ end
56
62
  end
57
63
  else
58
64
  link_to resource_path, class: css_class do
data/app/forms/decidim/budgets/admin/project_import_proposals_form.rb CHANGED
@@ -14,6 +14,7 @@ module Decidim
14
14
 
15
15
  validates :origin_component_id, :origin_component, :current_component, presence: true
16
16
  validates :default_budget, presence: true, numericality: { greater_than: 0 }
17
+ validate :valid_states
17
18
 
18
19
  def states
19
20
  super.compact_blank
@@ -36,6 +37,18 @@ module Decidim
36
37
  def budget
37
38
  @budget ||= context[:budget]
38
39
  end
40
+
41
+ private
42
+
43
+ def valid_states
44
+ return unless origin_component
45
+ return if states.empty?
46
+
47
+ valid_tokens = Decidim::Proposals::ProposalState.where(component: origin_component).pluck(:token) + ["not_answered"]
48
+ return if states.all? { |state| valid_tokens.include?(state) }
49
+
50
+ errors.add(:states, :invalid)
51
+ end
39
52
  end
40
53
  end
41
54
  end
data/app/views/decidim/budgets/admin/projects/_actions.html.erb CHANGED
@@ -57,7 +57,7 @@
57
57
  <% end %>
58
58
  <% else %>
59
59
  <div class="dropdown__button-disabled">
60
- <%= with_tooltip t("tooltips.deleted_projects_info", scope: "decidim.admin") do %>
60
+ <%= with_tooltip t("tooltips.deleted_projects_info", scope: "decidim.admin"), class: :left do %>
61
61
  <%= icon "delete-bin-line", class: "text-gray" %>
62
62
  <span>
63
63
  <%= t("actions.soft_delete", scope: "decidim.admin") %>
data/decidim-budgets.gemspec CHANGED
@@ -3,7 +3,7 @@
3
3
  $LOAD_PATH.push File.expand_path("lib", __dir__)
4
4
 
5
5
  Gem::Specification.new do |s|
6
- version = "0.32.0.rc2"
6
+ version = "0.32.0.rc3"
7
7
  s.version = version
8
8
  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
9
9
  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
data/lib/decidim/budgets/version.rb CHANGED
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-budgets version.
5
5
  module Budgets
6
6
  def self.version
7
- "0.32.0.rc2"
7
+ "0.32.0.rc3"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-budgets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.32.0.rc2
4
+ version: 0.32.0.rc3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -17,70 +17,70 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 0.32.0.rc2
20
+ version: 0.32.0.rc3
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: 0.32.0.rc2
27
+ version: 0.32.0.rc3
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: decidim-core
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - '='
33
33
  - !ruby/object:Gem::Version
34
- version: 0.32.0.rc2
34
+ version: 0.32.0.rc3
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - '='
40
40
  - !ruby/object:Gem::Version
41
- version: 0.32.0.rc2
41
+ version: 0.32.0.rc3
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: decidim-admin
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - '='
47
47
  - !ruby/object:Gem::Version
48
- version: 0.32.0.rc2
48
+ version: 0.32.0.rc3
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - '='
54
54
  - !ruby/object:Gem::Version
55
- version: 0.32.0.rc2
55
+ version: 0.32.0.rc3
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: decidim-dev
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - '='
61
61
  - !ruby/object:Gem::Version
62
- version: 0.32.0.rc2
62
+ version: 0.32.0.rc3
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - '='
68
68
  - !ruby/object:Gem::Version
69
- version: 0.32.0.rc2
69
+ version: 0.32.0.rc3
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: decidim-proposals
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
74
  - - '='
75
75
  - !ruby/object:Gem::Version
76
- version: 0.32.0.rc2
76
+ version: 0.32.0.rc3
77
77
  type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
81
  - - '='
82
82
  - !ruby/object:Gem::Version
83
- version: 0.32.0.rc2
83
+ version: 0.32.0.rc3
84
84
  description: A budgets component for decidim's participatory spaces.
85
85
  email:
86
86
  - josepjaume@gmail.com