Skip to content

Commit f4d5162

Browse files
andreslucenaandreslucena
committed
Merge branch 'develop' into feature/enum-access-mode-spaces
2 parents c60a07a + e40567c commit f4d5162

191 files changed

Lines changed: 1728 additions & 489 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.erb_lint.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ linters:
2424
- text/template
2525
- application/ld+json
2626

27+
AdminPageTitleLinter:
28+
enabled: true
29+
exclude:
30+
- decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
31+
- decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
32+
- decidim-admin/app/views/decidim/admin/imports/new.html.erb
33+
- decidim-meetings/app/views/decidim/meetings/admin/poll/edit.html.erb
34+
2735
DeprecatedClasses:
2836
enabled: true
2937
exclude:

‎.erb_linters/admin_page_title_linter.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# frozen_string_literal: true
2+
3+
require_relative "../decidim-dev/lib/erb_lint/linters/admin_page_title_linter"

‎.github/workflows/publiccode-yml-validation.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ jobs:
1111
- uses: italia/publiccode-parser-action@v1
1212
with:
1313
publiccode: 'publiccode.yml'
14+
no-network: true

‎Gemfile.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ PATH
205205
GEM
206206
remote: https://rubygems.org/
207207
specs:
208-
action_text-trix (2.1.16)
208+
action_text-trix (2.1.17)
209209
railties
210210
actioncable (8.1.2)
211211
actionpack (= 8.1.2)
@@ -361,7 +361,7 @@ GEM
361361
declarative-builder (0.2.0)
362362
trailblazer-option (~> 0.1.0)
363363
declarative-option (0.1.0)
364-
devise (5.0.2)
364+
devise (5.0.3)
365365
bcrypt (~> 3.0)
366366
orm_adapter (~> 0.1)
367367
railties (>= 7.0)
@@ -773,14 +773,14 @@ GEM
773773
rspec-mocks (3.13.8)
774774
diff-lcs (>= 1.2.0, < 2.0)
775775
rspec-support (~> 3.13.0)
776-
rspec-rails (8.0.3)
776+
rspec-rails (8.0.4)
777777
actionpack (>= 7.2)
778778
activesupport (>= 7.2)
779779
railties (>= 7.2)
780-
rspec-core (~> 3.13)
781-
rspec-expectations (~> 3.13)
782-
rspec-mocks (~> 3.13)
783-
rspec-support (~> 3.13)
780+
rspec-core (>= 3.13.0, < 5.0.0)
781+
rspec-expectations (>= 3.13.0, < 5.0.0)
782+
rspec-mocks (>= 3.13.0, < 5.0.0)
783+
rspec-support (>= 3.13.0, < 5.0.0)
784784
rspec-retry (0.6.2)
785785
rspec-core (> 3.3)
786786
rspec-support (3.13.7)

‎decidim-admin/app/helpers/decidim/admin/settings_helper.rb‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ def integer_with_units(form, attribute, name, i18n_scope, options)
227227
# @param i18n_scope (see #settings_attribute_input)
228228
# @param [Object] form
229229
def taxonomy_filters(form, name, i18n_scope)
230+
return disabled_taxonomy_filters(name, i18n_scope) if @component&.new_record?
231+
230232
current_filters = content_tag(:div, class: "js-current-filters") do
231233
render partial: "decidim/admin/taxonomy_filters_selector/component_table",
232234
locals: { field_name: "#{form.object_name}[#{name}][]", component: @component }
@@ -250,6 +252,15 @@ def taxonomy_filters(form, name, i18n_scope)
250252

251253
label_tag(name, t(name, scope: i18n_scope)) + container + drawer
252254
end
255+
256+
def disabled_taxonomy_filters(name, i18n_scope)
257+
container = content_tag(:div) do
258+
message = t("taxonomy_filters_unavailable", scope: "decidim.components.settings.global")
259+
content_tag(:p, message, class: "help-text")
260+
end
261+
262+
label_tag(name, t(name, scope: i18n_scope)) + container
263+
end
253264
end
254265
end
255266
end

‎decidim-admin/app/views/decidim/admin/admin_terms/show.html.erb‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
<% add_decidim_page_title(t(".title")) %>
2+
13
<%= cell("decidim/announcement", announcement_body, callout_class: current_user.admin_terms_accepted? ? "success" : "warning" ) %>
24

35
<div class="item_show__header">
46
<h1 class="item_show__header-title">
5-
<%= t("title", scope: "decidim.admin.admin_terms_of_service") %>
7+
<%= t(".title") %>
68
</h1>
79
</div>
810

‎decidim-admin/app/views/decidim/admin/area_types/index.html.erb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<% add_decidim_page_title(t("decidim.admin.titles.area_types")) %>
1+
<% add_decidim_page_title(t(".title")) %>
2+
23
<div class="card" id="area-types">
34
<div class="item_show__header">
45
<h1 class="item_show__header-title">
5-
<%= t "decidim.admin.titles.area_types" %>
6+
<%= t(".title") %>
67
<% if allowed_to? :create, :area_type %>
78
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button button__sm button__secondary new" %>
89
<% end %>

‎decidim-admin/app/views/decidim/admin/areas/index.html.erb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
1+
<% add_decidim_page_title(t(".title")) %>
2+
23
<div class="card" id="areas">
34
<div class="item_show__header">
45
<h1 class="item_show__header-title">
5-
<%= t "decidim.admin.titles.areas" %>
6+
<%= t ".title" %>
67
<% if allowed_to? :create, :area %>
78
<%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
89
<% end %>

‎decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
1+
<% add_decidim_page_title(t(".title")) %>
22

33
<div class="item_show__header">
44
<h1 class="item_show__header-title">
5-
<%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
5+
<%= t(".title") %>
66
</h1>
77
</div>
88

‎decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
1+
<% add_decidim_page_title(t(".title")) %>
22

33
<div class="card" id="attachment_collections">
44
<div class="item_show__header">
55
<h1 class="item_show__header-title">
6-
<%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
6+
<%= t(".title") %>
77
<% if allowed_to? :create, :attachment_collection %>
88
<%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
99
<% end %>

0 commit comments

Comments
 (0)