Skip to content

Commit

Permalink
Merge pull request #425 from gencat/fix/process_groups
Browse files Browse the repository at this point in the history 
Fix processes groups in show
  • Loading branch information
@laurajaime
laurajaime authored Mar 28, 2023
2 parents a4b1351 + c004ae8 commit ae2836a
Show file tree
Hide file tree
Showing 6 changed files with 178 additions and 126 deletions.
206 changes: 106 additions & 100 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
GIT
remote: https://github.com/CodiTramuntana/decidim
revision: 99f93dae4d0cc09b7c5e8806e13fe7f5126a2399
revision: f7b34af3b665edc67259d11996a5a82b3f914f26
branch: release/0.26-stable
specs:
decidim (0.26.3)
decidim-accountability (= 0.26.3)
decidim-admin (= 0.26.3)
decidim-api (= 0.26.3)
decidim-assemblies (= 0.26.3)
decidim-blogs (= 0.26.3)
decidim-budgets (= 0.26.3)
decidim-comments (= 0.26.3)
decidim-core (= 0.26.3)
decidim-debates (= 0.26.3)
decidim-forms (= 0.26.3)
decidim-generators (= 0.26.3)
decidim-meetings (= 0.26.3)
decidim-pages (= 0.26.3)
decidim-participatory_processes (= 0.26.3)
decidim-proposals (= 0.26.3)
decidim-sortitions (= 0.26.3)
decidim-surveys (= 0.26.3)
decidim-system (= 0.26.3)
decidim-templates (= 0.26.3)
decidim-verifications (= 0.26.3)
decidim-accountability (0.26.3)
decidim-comments (= 0.26.3)
decidim-core (= 0.26.3)
decidim-admin (0.26.3)
decidim (0.26.5)
decidim-accountability (= 0.26.5)
decidim-admin (= 0.26.5)
decidim-api (= 0.26.5)
decidim-assemblies (= 0.26.5)
decidim-blogs (= 0.26.5)
decidim-budgets (= 0.26.5)
decidim-comments (= 0.26.5)
decidim-core (= 0.26.5)
decidim-debates (= 0.26.5)
decidim-forms (= 0.26.5)
decidim-generators (= 0.26.5)
decidim-meetings (= 0.26.5)
decidim-pages (= 0.26.5)
decidim-participatory_processes (= 0.26.5)
decidim-proposals (= 0.26.5)
decidim-sortitions (= 0.26.5)
decidim-surveys (= 0.26.5)
decidim-system (= 0.26.5)
decidim-templates (= 0.26.5)
decidim-verifications (= 0.26.5)
decidim-accountability (0.26.5)
decidim-comments (= 0.26.5)
decidim-core (= 0.26.5)
decidim-admin (0.26.5)
active_link_to (~> 1.0)
decidim-core (= 0.26.3)
decidim-core (= 0.26.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0)
decidim-api (0.26.3)
decidim-api (0.26.5)
graphql (~> 1.12, < 1.13)
rack-cors (~> 1.0)
redcarpet (~> 3.5, >= 3.5.1)
decidim-assemblies (0.26.3)
decidim-core (= 0.26.3)
decidim-blogs (0.26.3)
decidim-admin (= 0.26.3)
decidim-comments (= 0.26.3)
decidim-core (= 0.26.3)
decidim-budgets (0.26.3)
decidim-comments (= 0.26.3)
decidim-core (= 0.26.3)
decidim-comments (0.26.3)
decidim-core (= 0.26.3)
decidim-assemblies (0.26.5)
decidim-core (= 0.26.5)
decidim-blogs (0.26.5)
decidim-admin (= 0.26.5)
decidim-comments (= 0.26.5)
decidim-core (= 0.26.5)
decidim-budgets (0.26.5)
decidim-comments (= 0.26.5)
decidim-core (= 0.26.5)
decidim-comments (0.26.5)
decidim-core (= 0.26.5)
redcarpet (~> 3.5, >= 3.5.1)
decidim-core (0.26.3)
decidim-core (0.26.5)
active_link_to (~> 1.0)
acts_as_list (~> 0.9)
batch-loader (~> 1.2)
Expand All @@ -59,7 +59,7 @@ GIT
cells-rails (~> 0.1.3)
charlock_holmes (~> 0.7)
date_validator (~> 0.9.0)
decidim-api (= 0.26.3)
decidim-api (= 0.26.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
diffy (~> 3.3)
Expand Down Expand Up @@ -101,15 +101,15 @@ GIT
valid_email2 (~> 2.1)
webpacker (= 6.0.0.rc.5)
wisper (~> 2.0)
decidim-debates (0.26.3)
decidim-comments (= 0.26.3)
decidim-core (= 0.26.3)
decidim-dev (0.26.3)
decidim-debates (0.26.5)
decidim-comments (= 0.26.5)
decidim-core (= 0.26.5)
decidim-dev (0.26.5)
axe-core-rspec (~> 4.1.0)
byebug (~> 11.0)
capybara (~> 3.24)
db-query-matchers (~> 0.10.0)
decidim (= 0.26.3)
decidim (= 0.26.5)
erb_lint (~> 0.0.35)
factory_bot_rails (~> 4.8)
i18n-tasks (~> 0.9.18)
Expand All @@ -132,45 +132,45 @@ GIT
w3c_rspec_validators (~> 0.3.0)
webmock (~> 3.6)
wisper-rspec (~> 1.0)
decidim-forms (0.26.3)
decidim-core (= 0.26.3)
decidim-forms (0.26.5)
decidim-core (= 0.26.5)
wicked_pdf (~> 2.1)
wkhtmltopdf-binary (~> 0.12)
decidim-generators (0.26.3)
decidim-core (= 0.26.3)
decidim-meetings (0.26.3)
decidim-core (= 0.26.3)
decidim-forms (= 0.26.3)
decidim-generators (0.26.5)
decidim-core (= 0.26.5)
decidim-meetings (0.26.5)
decidim-core (= 0.26.5)
decidim-forms (= 0.26.5)
icalendar (~> 2.5)
decidim-pages (0.26.3)
decidim-core (= 0.26.3)
decidim-participatory_processes (0.26.3)
decidim-core (= 0.26.3)
decidim-proposals (0.26.3)
decidim-comments (= 0.26.3)
decidim-core (= 0.26.3)
decidim-pages (0.26.5)
decidim-core (= 0.26.5)
decidim-participatory_processes (0.26.5)
decidim-core (= 0.26.5)
decidim-proposals (0.26.5)
decidim-comments (= 0.26.5)
decidim-core (= 0.26.5)
doc2text (~> 0.4.4)
redcarpet (~> 3.5, >= 3.5.1)
decidim-sortitions (0.26.3)
decidim-admin (= 0.26.3)
decidim-comments (= 0.26.3)
decidim-core (= 0.26.3)
decidim-proposals (= 0.26.3)
decidim-surveys (0.26.3)
decidim-core (= 0.26.3)
decidim-forms (= 0.26.3)
decidim-templates (= 0.26.3)
decidim-system (0.26.3)
decidim-sortitions (0.26.5)
decidim-admin (= 0.26.5)
decidim-comments (= 0.26.5)
decidim-core (= 0.26.5)
decidim-proposals (= 0.26.5)
decidim-surveys (0.26.5)
decidim-core (= 0.26.5)
decidim-forms (= 0.26.5)
decidim-templates (= 0.26.5)
decidim-system (0.26.5)
active_link_to (~> 1.0)
decidim-core (= 0.26.3)
decidim-core (= 0.26.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0)
decidim-templates (0.26.3)
decidim-core (= 0.26.3)
decidim-forms (= 0.26.3)
decidim-verifications (0.26.3)
decidim-core (= 0.26.3)
decidim-templates (0.26.5)
decidim-core (= 0.26.5)
decidim-forms (= 0.26.5)
decidim-verifications (0.26.5)
decidim-core (= 0.26.5)

GIT
remote: https://github.com/gencat/decidim-module-challenges.git
Expand Down Expand Up @@ -321,7 +321,7 @@ GEM
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
axe-core-api (4.5.0)
axe-core-api (4.6.0)
dumb_delegator
virtus
axe-core-rspec (4.1.0)
Expand Down Expand Up @@ -357,7 +357,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
carrierwave (2.2.2)
carrierwave (2.2.3)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
Expand All @@ -377,7 +377,7 @@ GEM
actionpack (>= 5.0)
cells (>= 4.1.6, < 5.0.0)
charlock_holmes (0.7.7)
chef-utils (18.0.172)
chef-utils (18.1.29)
concurrent-ruby
childprocess (3.0.0)
chronic (0.10.2)
Expand All @@ -394,7 +394,7 @@ GEM
crack (0.4.5)
rexml
crass (1.0.6)
css_parser (1.12.0)
css_parser (1.14.0)
addressable
daemons (1.4.1)
database_cleaner (2.0.1)
Expand Down Expand Up @@ -429,15 +429,15 @@ GEM
delayed_job (>= 3.0, < 5)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.8.1)
devise (4.9.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-i18n (1.10.2)
devise (>= 4.8.0)
devise_invitable (2.0.6)
devise-i18n (1.11.0)
devise (>= 4.9.0)
devise_invitable (2.0.7)
actionmailer (>= 5.0)
devise (>= 4.6)
diff-lcs (1.5.0)
Expand All @@ -446,7 +446,7 @@ GEM
nokogiri (>= 1.13.2, < 1.14.0)
rubyzip (~> 2.3.0)
docile (1.4.0)
doorkeeper (5.6.0)
doorkeeper (5.6.5)
railties (>= 5)
doorkeeper-i18n (4.0.1)
dumb_delegator (1.0.0)
Expand All @@ -462,7 +462,7 @@ GEM
erbse (0.1.4)
temple
erubi (1.11.0)
excon (0.93.1)
excon (0.99.0)
execjs (2.8.1)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -500,7 +500,7 @@ GEM
graphql (1.12.24)
hashdiff (1.0.1)
hashie (3.6.0)
highline (2.0.3)
highline (2.1.0)
html_tokenizer (0.0.7)
htmlentities (4.3.4)
i18n (1.12.0)
Expand Down Expand Up @@ -571,8 +571,8 @@ GEM
method_source (1.0.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_magick (4.11.0)
mime-types-data (3.2023.0218.1)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.3)
Expand All @@ -585,6 +585,10 @@ GEM
multi_xml (0.6.0)
multipart-post (2.0.0)
mustache (1.1.1)
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
Expand Down Expand Up @@ -640,12 +644,13 @@ GEM
activerecord (>= 5.2)
activesupport (>= 5.2)
polyglot (0.3.5)
premailer (1.18.0)
premailer (1.20.0)
addressable
css_parser (>= 1.12.0)
htmlentities (>= 4.0.0)
premailer-rails (1.11.1)
premailer-rails (1.12.0)
actionmailer (>= 3)
net-smtp
premailer (~> 1.7, >= 1.7.9)
public_suffix (5.0.0)
puma (5.6.4)
Expand All @@ -658,7 +663,7 @@ GEM
rack (>= 2.0.0)
rack-protection (3.0.5)
rack
rack-proxy (0.7.4)
rack-proxy (0.7.6)
rack
rack-test (2.0.2)
rack (>= 1.3)
Expand Down Expand Up @@ -712,14 +717,14 @@ GEM
activesupport (>= 4.1.0)
virtus (~> 1.0.5)
wisper (>= 1.6.1)
redcarpet (3.5.1)
redis (4.8.0)
redcarpet (3.6.0)
redis (4.8.1)
regexp_parser (2.5.0)
request_store (1.5.1)
rack (>= 1.4)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
responders (3.1.0)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.5)
rspec (3.11.0)
rspec-core (~> 3.11.0)
Expand Down Expand Up @@ -819,12 +824,13 @@ GEM
ffi (>= 1.0.0)
system_test_html_screenshots (0.2.0)
actionpack (>= 5.2, < 6.1.a)
temple (0.9.1)
temple (0.10.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.11)
tilt (2.1.0)
timeout (0.3.2)
tomlrb (2.0.3)
tzinfo (1.2.10)
thread_safe (~> 0.1)
Expand Down Expand Up @@ -872,7 +878,7 @@ GEM
activesupport
wisper (2.0.1)
wisper-rspec (1.1.0)
wkhtmltopdf-binary (0.12.6.5)
wkhtmltopdf-binary (0.12.6.6)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.0)
Expand Down
8 changes: 6 additions & 2 deletions .../app/decorators/decidim/participatory_processes/participatory_process_search_decorator.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch.class_eval do
def initialize(options = {})
options.has_key?(:base_relation) ? options.delete(:base_relation) : Decidim::ParticipatoryProcess.all
super(Decidim::ParticipatoryProcess.where(decidim_participatory_process_group_id: Rails.application.config.process), options)
base_relation = if options.has_key?(:base_relation)
options.delete(:base_relation)
else
Decidim::ParticipatoryProcess.where(decidim_participatory_process_group_id: Rails.application.config.process)
end
super(base_relation, options)
end
end
1 change: 1 addition & 0 deletions ...-extended/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<div class="row">
<div class="columns medium-7 mediumlarge-8">
<div class="section">
<h2 class="show-for-sr"><%= t(".title") %></h2>
<% if participatory_process_group.present? %>
<%= render partial: "participatory_process_group" %>
<% end %>
Expand Down
Loading

0 comments on commit ae2836a

Please sign in to comment.