decidim-assemblies 0.19.1 → 0.20.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb +1 -7
- data/app/models/decidim/assembly.rb +13 -0
- data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb +1 -1
- data/lib/decidim/assemblies/participatory_space.rb +2 -0
- data/lib/decidim/assemblies/version.rb +1 -1
- metadata +8 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: aca8716bdc4bf77497ebfa07b8c48b87611864d29958f535d723753e13950cc2
|
4
|
+
data.tar.gz: f0d3d201be26fcabea0e782763d52f60dfc2566e3524b5520603ccc38d60fa80
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ca5b238c00648013173e8a00fd99ade647ffce4dbd4a93b6d7c8a53e6be6ec5fc3b067f4f64e5cc4c6d2b23e6451f80166f693480f4d49d65445738cb4bb2026
|
7
|
+
data.tar.gz: 380c4febb188fb9c5eb79555c9275da768d97289fff457e9c10a83ed545956cf776ede7b65ec055268bd8b5fb3c9f40ec98a5ea84b1200f509294b1d22d2214c
|
@@ -10,8 +10,6 @@ module Decidim
|
|
10
10
|
helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space, :query
|
11
11
|
layout "decidim/admin/assemblies"
|
12
12
|
|
13
|
-
before_action :set_all_assemblies, except: [:index]
|
14
|
-
|
15
13
|
def index
|
16
14
|
enforce_permission_to :read, :assembly_list
|
17
15
|
@assemblies = collection
|
@@ -86,10 +84,6 @@ module Decidim
|
|
86
84
|
@collection ||= paginate(query.result)
|
87
85
|
end
|
88
86
|
|
89
|
-
def set_all_assemblies
|
90
|
-
@all_assemblies = organization_assemblies
|
91
|
-
end
|
92
|
-
|
93
87
|
def current_assembly
|
94
88
|
scope = organization_assemblies
|
95
89
|
@current_assembly ||= scope.where(slug: params[:slug]).or(
|
@@ -104,7 +98,7 @@ module Decidim
|
|
104
98
|
end
|
105
99
|
|
106
100
|
def parent_assemblies
|
107
|
-
@parent_assemblies ||= organization_assemblies.where(
|
101
|
+
@parent_assemblies ||= organization_assemblies.where.not(id: current_assembly)
|
108
102
|
end
|
109
103
|
|
110
104
|
def assembly_params
|
@@ -31,6 +31,7 @@ module Decidim
|
|
31
31
|
include Decidim::Loggable
|
32
32
|
include Decidim::ParticipatorySpaceResourceable
|
33
33
|
include Decidim::HasPrivateUsers
|
34
|
+
include Decidim::Searchable
|
34
35
|
|
35
36
|
SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
|
36
37
|
ASSEMBLY_TYPES = %w(government executive consultative_advisory participatory working_group commission others).freeze
|
@@ -68,6 +69,18 @@ module Decidim
|
|
68
69
|
after_create :set_parents_path
|
69
70
|
after_update :set_parents_path, :update_children_paths, if: :saved_change_to_parent_id?
|
70
71
|
|
72
|
+
searchable_fields({
|
73
|
+
scope_id: :decidim_scope_id,
|
74
|
+
participatory_space: :itself,
|
75
|
+
A: :title,
|
76
|
+
B: :subtitle,
|
77
|
+
C: :short_description,
|
78
|
+
D: :description,
|
79
|
+
datetime: :published_at
|
80
|
+
},
|
81
|
+
index_on_create: ->(_assembly) { false },
|
82
|
+
index_on_update: ->(assembly) { assembly.visible? })
|
83
|
+
|
71
84
|
# Overwriting existing method Decidim::HasPrivateUsers.visible_for
|
72
85
|
def self.visible_for(user)
|
73
86
|
if user
|
@@ -13,6 +13,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
13
13
|
participatory_space.register_resource(:assembly) do |resource|
|
14
14
|
resource.model_class_name = "Decidim::Assembly"
|
15
15
|
resource.card = "decidim/assemblies/assembly"
|
16
|
+
resource.searchable = true
|
16
17
|
end
|
17
18
|
|
18
19
|
participatory_space.context(:public) do |context|
|
@@ -149,6 +150,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
|
|
149
150
|
)
|
150
151
|
|
151
152
|
[assembly, child].each do |current_assembly|
|
153
|
+
current_assembly.add_to_index_as_search_resource
|
152
154
|
attachment_collection = Decidim::AttachmentCollection.create!(
|
153
155
|
name: Decidim::Faker::Localized.word,
|
154
156
|
description: Decidim::Faker::Localized.sentence(5),
|
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.
|
4
|
+
version: 0.20.0
|
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:
|
13
|
+
date: 2020-01-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.
|
21
|
+
version: 0.20.0
|
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.
|
28
|
+
version: 0.20.0
|
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.
|
35
|
+
version: 0.20.0
|
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.
|
42
|
+
version: 0.20.0
|
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.
|
49
|
+
version: 0.20.0
|
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.
|
56
|
+
version: 0.20.0
|
57
57
|
description: Assemblies component for decidim.
|
58
58
|
email:
|
59
59
|
- josepjaume@gmail.com
|