decidim-proposals 0.7.1 → 0.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/app/commands/decidim/proposals/create_proposal.rb +23 -2
- data/app/controllers/decidim/proposals/proposals_controller.rb +0 -7
- data/app/views/decidim/proposals/proposals/index.html.erb +3 -7
- data/config/locales/ca.yml +0 -1
- data/config/locales/en.yml +0 -1
- data/config/locales/es.yml +0 -1
- data/lib/decidim/proposals/version.rb +1 -1
- metadata +19 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: fa7d1d716522e96b31cbd7c0e4693b5e9128655d6f7d0cd6fa245d8768ffaa30
|
4
|
+
data.tar.gz: c9b5b73af870f75980dfe84842ea827ee36d91efcfbb1eb46f5fe5605af72b3b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5be17d7e63d9360a8ade2e426580d914169ac5f5b8304155a3107df589ded5efab72e0a6dde9eb28600fde53be0840e12d6d5de5c1feb0983d83f31611cd81a1
|
7
|
+
data.tar.gz: bcdbecaa57ce9a1d2774402d3b431f776531405d9e9588f6fae243f479f1948dec75c1feebd4a4ec44ed00224494ffce213372c4f746f1c4f1c40a8a1bb65b26
|
@@ -20,9 +20,13 @@ module Decidim
|
|
20
20
|
#
|
21
21
|
# Returns nothing.
|
22
22
|
def call
|
23
|
-
return broadcast(:invalid) if proposal_limit_reached?
|
24
23
|
return broadcast(:invalid) if form.invalid?
|
25
24
|
|
25
|
+
if proposal_limit_reached?
|
26
|
+
form.errors.add(:base, I18n.t("decidim.proposals.new.limit_reached"))
|
27
|
+
return broadcast(:invalid)
|
28
|
+
end
|
29
|
+
|
26
30
|
if process_attachments?
|
27
31
|
build_attachment
|
28
32
|
return broadcast(:invalid) if attachment_invalid?
|
@@ -91,12 +95,29 @@ module Decidim
|
|
91
95
|
proposal_limit = form.current_feature.settings.proposal_limit
|
92
96
|
|
93
97
|
return false if proposal_limit.zero?
|
94
|
-
|
98
|
+
|
99
|
+
if user_group
|
100
|
+
user_group_proposals.count >= proposal_limit
|
101
|
+
else
|
102
|
+
current_user_proposals.count >= proposal_limit
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
def user_group
|
107
|
+
@user_group ||= Decidim::UserGroup.where(organization: organization, id: form.user_group_id).first
|
108
|
+
end
|
109
|
+
|
110
|
+
def organization
|
111
|
+
@organization ||= @current_user.organization
|
95
112
|
end
|
96
113
|
|
97
114
|
def current_user_proposals
|
98
115
|
Proposal.where(author: @current_user, feature: form.current_feature)
|
99
116
|
end
|
117
|
+
|
118
|
+
def user_group_proposals
|
119
|
+
Proposal.where(user_group: @user_group, feature: form.current_feature)
|
120
|
+
end
|
100
121
|
end
|
101
122
|
end
|
102
123
|
end
|
@@ -12,7 +12,6 @@ module Decidim
|
|
12
12
|
|
13
13
|
helper_method :geocoded_proposals
|
14
14
|
before_action :authenticate_user!, only: [:new, :create]
|
15
|
-
before_action :check_proposal_limit!, only: [:new, :create]
|
16
15
|
|
17
16
|
def index
|
18
17
|
@proposals = search
|
@@ -87,12 +86,6 @@ module Decidim
|
|
87
86
|
related_to: ""
|
88
87
|
}
|
89
88
|
end
|
90
|
-
|
91
|
-
def check_proposal_limit!
|
92
|
-
return unless proposal_limit_reached?
|
93
|
-
flash[:error] = I18n.t("proposals.new.limit_reached", scope: "decidim")
|
94
|
-
redirect_to action: :index
|
95
|
-
end
|
96
89
|
end
|
97
90
|
end
|
98
91
|
end
|
@@ -34,13 +34,9 @@
|
|
34
34
|
<%= render partial: "count" %>
|
35
35
|
</h2>
|
36
36
|
<% if current_settings.creation_enabled %>
|
37
|
-
|
38
|
-
<%=
|
39
|
-
|
40
|
-
<%= icon "plus" %>
|
41
|
-
<% end %>
|
42
|
-
<% else %>
|
43
|
-
<%= content_tag :a, t(".new_proposal"), class: "title-action__action button small hollow disabled", title: t(".proposal_limit_reached") %>
|
37
|
+
<%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow" do %>
|
38
|
+
<%= t(".new_proposal") %>
|
39
|
+
<%= icon "plus" %>
|
44
40
|
<% end %>
|
45
41
|
<% else %>
|
46
42
|
<span class="title-action__action button small hollow disabled">
|
data/config/locales/ca.yml
CHANGED
data/config/locales/en.yml
CHANGED
data/config/locales/es.yml
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-proposals
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josep Jaume Rey Peroy
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2017-
|
13
|
+
date: 2017-11-07 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: decidim-core
|
@@ -18,28 +18,28 @@ dependencies:
|
|
18
18
|
requirements:
|
19
19
|
- - '='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.7.
|
21
|
+
version: 0.7.2
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
requirements:
|
26
26
|
- - '='
|
27
27
|
- !ruby/object:Gem::Version
|
28
|
-
version: 0.7.
|
28
|
+
version: 0.7.2
|
29
29
|
- !ruby/object:Gem::Dependency
|
30
30
|
name: decidim-comments
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
32
32
|
requirements:
|
33
33
|
- - '='
|
34
34
|
- !ruby/object:Gem::Version
|
35
|
-
version: 0.7.
|
35
|
+
version: 0.7.2
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
40
|
- - '='
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 0.7.
|
42
|
+
version: 0.7.2
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: kaminari
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
@@ -74,84 +74,84 @@ dependencies:
|
|
74
74
|
requirements:
|
75
75
|
- - '='
|
76
76
|
- !ruby/object:Gem::Version
|
77
|
-
version: 0.7.
|
77
|
+
version: 0.7.2
|
78
78
|
type: :development
|
79
79
|
prerelease: false
|
80
80
|
version_requirements: !ruby/object:Gem::Requirement
|
81
81
|
requirements:
|
82
82
|
- - '='
|
83
83
|
- !ruby/object:Gem::Version
|
84
|
-
version: 0.7.
|
84
|
+
version: 0.7.2
|
85
85
|
- !ruby/object:Gem::Dependency
|
86
86
|
name: decidim-admin
|
87
87
|
requirement: !ruby/object:Gem::Requirement
|
88
88
|
requirements:
|
89
89
|
- - '='
|
90
90
|
- !ruby/object:Gem::Version
|
91
|
-
version: 0.7.
|
91
|
+
version: 0.7.2
|
92
92
|
type: :development
|
93
93
|
prerelease: false
|
94
94
|
version_requirements: !ruby/object:Gem::Requirement
|
95
95
|
requirements:
|
96
96
|
- - '='
|
97
97
|
- !ruby/object:Gem::Version
|
98
|
-
version: 0.7.
|
98
|
+
version: 0.7.2
|
99
99
|
- !ruby/object:Gem::Dependency
|
100
100
|
name: decidim-participatory_processes
|
101
101
|
requirement: !ruby/object:Gem::Requirement
|
102
102
|
requirements:
|
103
103
|
- - '='
|
104
104
|
- !ruby/object:Gem::Version
|
105
|
-
version: 0.7.
|
105
|
+
version: 0.7.2
|
106
106
|
type: :development
|
107
107
|
prerelease: false
|
108
108
|
version_requirements: !ruby/object:Gem::Requirement
|
109
109
|
requirements:
|
110
110
|
- - '='
|
111
111
|
- !ruby/object:Gem::Version
|
112
|
-
version: 0.7.
|
112
|
+
version: 0.7.2
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: decidim-assemblies
|
115
115
|
requirement: !ruby/object:Gem::Requirement
|
116
116
|
requirements:
|
117
117
|
- - '='
|
118
118
|
- !ruby/object:Gem::Version
|
119
|
-
version: 0.7.
|
119
|
+
version: 0.7.2
|
120
120
|
type: :development
|
121
121
|
prerelease: false
|
122
122
|
version_requirements: !ruby/object:Gem::Requirement
|
123
123
|
requirements:
|
124
124
|
- - '='
|
125
125
|
- !ruby/object:Gem::Version
|
126
|
-
version: 0.7.
|
126
|
+
version: 0.7.2
|
127
127
|
- !ruby/object:Gem::Dependency
|
128
128
|
name: decidim-meetings
|
129
129
|
requirement: !ruby/object:Gem::Requirement
|
130
130
|
requirements:
|
131
131
|
- - '='
|
132
132
|
- !ruby/object:Gem::Version
|
133
|
-
version: 0.7.
|
133
|
+
version: 0.7.2
|
134
134
|
type: :development
|
135
135
|
prerelease: false
|
136
136
|
version_requirements: !ruby/object:Gem::Requirement
|
137
137
|
requirements:
|
138
138
|
- - '='
|
139
139
|
- !ruby/object:Gem::Version
|
140
|
-
version: 0.7.
|
140
|
+
version: 0.7.2
|
141
141
|
- !ruby/object:Gem::Dependency
|
142
142
|
name: decidim-budgets
|
143
143
|
requirement: !ruby/object:Gem::Requirement
|
144
144
|
requirements:
|
145
145
|
- - '='
|
146
146
|
- !ruby/object:Gem::Version
|
147
|
-
version: 0.7.
|
147
|
+
version: 0.7.2
|
148
148
|
type: :development
|
149
149
|
prerelease: false
|
150
150
|
version_requirements: !ruby/object:Gem::Requirement
|
151
151
|
requirements:
|
152
152
|
- - '='
|
153
153
|
- !ruby/object:Gem::Version
|
154
|
-
version: 0.7.
|
154
|
+
version: 0.7.2
|
155
155
|
description: A proposals component for decidim's participatory processes.
|
156
156
|
email:
|
157
157
|
- josepjaume@gmail.com
|
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
275
275
|
version: '0'
|
276
276
|
requirements: []
|
277
277
|
rubyforge_project:
|
278
|
-
rubygems_version: 2.
|
278
|
+
rubygems_version: 2.7.1
|
279
279
|
signing_key:
|
280
280
|
specification_version: 4
|
281
281
|
summary: A proposals component for decidim's participatory processes.
|