decidim-assemblies 0.9.0 → 0.9.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/constraints/decidim/assemblies/current_assembly.rb +1 -1
  3. data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +1 -1
  4. data/app/controllers/decidim/assemblies/assemblies_controller.rb +5 -1
  5. data/lib/decidim/assemblies/version.rb +1 -1
  6. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 239b54948da6dacd5224932fd59660b9593c5f47658af0ece3f2e77cac509574
4
- data.tar.gz: f781b393aeaf19a7a5d5646c6fbb98fd450c79449ff054d0bb7d639490703ef7
3
+ metadata.gz: 4629a4020632853dfcf329943a309f3e61cc9b5a9cc16b8246da90979c3adc5d
4
+ data.tar.gz: 987a69d30fe256bd7be95fbca4018201e963da8d072f160bafd0a62e341d1927
5
5
  SHA512:
6
- metadata.gz: 6ca312550fe3293500f448d66eca8c343192cf4e6f416f5e8e22c2fc8e106f3b7cb7ac4f444db1b5e29a413dede542e54754b06258ee8d124ce17061a11a26f3
7
- data.tar.gz: 3a2eaf20e4de03122cf94a3a1b71d8e8058bf1acbcff54c01f973aa6f0a947e0142260e3d7bcbcf481925911728c70f7405fbc56faf716f22afc237ee17d95b3
6
+ metadata.gz: e843feee23a9d4b860a0086f6c3a201bea8541098cbe618f0379bdd295dcca4c89b986781a364aea171c48925d2256218daf79fd36cb96574d5da565017f21bf
7
+ data.tar.gz: 5473c6b58d40ccc4bff6df418e68ce00f8cdebad9beb280a60e04aee75bff28fc3ae59d084a38b893646a2fa5876f70dfb108fa6fdb1dda8dd6148ea8d119c47
data/app/constraints/decidim/assemblies/current_assembly.rb CHANGED
@@ -31,7 +31,7 @@ module Decidim
31
31
 
32
32
  def detect_current_assembly(params)
33
33
  organization_assemblies.where(slug: params["assembly_slug"]).or(
34
- organization_assemblies.where(id: params["assembly_id"])
34
+ organization_assemblies.where(id: params["assembly_slug"])
35
35
  ).first!
36
36
  end
37
37
 
data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb CHANGED
@@ -95,7 +95,7 @@ module Decidim
95
95
 
96
96
  def assembly_params
97
97
  {
98
- id: params[:id],
98
+ id: params[:slug],
99
99
  hero_image: current_assembly.hero_image,
100
100
  banner_image: current_assembly.banner_image
101
101
  }.merge(params[:assembly].to_unsafe_h)
data/app/controllers/decidim/assemblies/assemblies_controller.rb CHANGED
@@ -26,7 +26,11 @@ module Decidim
26
26
  private
27
27
 
28
28
  def current_participatory_space
29
- @current_participatory_space ||= OrganizationAssemblies.new(current_organization).query.find_by(slug: params[:slug])
29
+ return unless params[:slug]
30
+
31
+ @current_participatory_space ||= OrganizationAssemblies.new(current_organization).query.where(slug: params[:slug]).or(
32
+ OrganizationAssemblies.new(current_organization).query.where(id: params[:slug])
33
+ ).first!
30
34
  end
31
35
 
32
36
  def published_assemblies
data/lib/decidim/assemblies/version.rb CHANGED
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-assemblies version.
5
5
  module Assemblies
6
6
  def self.version
7
- "0.9.0"
7
+ "0.9.1"
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-assemblies
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
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: 2018-02-05 00:00:00.000000000 Z
13
+ date: 2018-02-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.9.0
21
+ version: 0.9.1
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.9.0
28
+ version: 0.9.1
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: decidim-admin
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.9.0
35
+ version: 0.9.1
36
36
  type: :development
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.9.0
42
+ version: 0.9.1
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: decidim-dev
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - '='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.9.0
49
+ version: 0.9.1
50
50
  type: :development
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - '='
55
55
  - !ruby/object:Gem::Version
56
- version: 0.9.0
56
+ version: 0.9.1
57
57
  description: Assemblies component for decidim.
58
58
  email:
59
59
  - josepjaume@gmail.com