Skip to content
Snippets Groups Projects
Commit bd85cf7a authored by Arnaud Levy's avatar Arnaud Levy
Browse files

Fix #1036

parent 058dc462
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Gemfile.lock
+ 56
− 56
View file @ bd85cf7a
......@@ -20,47 +20,47 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.5)
actionpack (= 7.0.5)
activesupport (= 7.0.5)
actioncable (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.5)
actionpack (= 7.0.5)
activejob (= 7.0.5)
activerecord (= 7.0.5)
activestorage (= 7.0.5)
activesupport (= 7.0.5)
actionmailbox (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.5)
actionpack (= 7.0.5)
actionview (= 7.0.5)
activejob (= 7.0.5)
activesupport (= 7.0.5)
actionmailer (7.0.5.1)
actionpack (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.5)
actionview (= 7.0.5)
activesupport (= 7.0.5)
actionpack (7.0.5.1)
actionview (= 7.0.5.1)
activesupport (= 7.0.5.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.5)
actionpack (= 7.0.5)
activerecord (= 7.0.5)
activestorage (= 7.0.5)
activesupport (= 7.0.5)
actiontext (7.0.5.1)
actionpack (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.5)
activesupport (= 7.0.5)
actionview (7.0.5.1)
activesupport (= 7.0.5.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
......@@ -70,25 +70,25 @@ GEM
activemodel (>= 5.2.0)
activestorage (>= 5.2.0)
activesupport (>= 5.2.0)
activejob (7.0.5)
activesupport (= 7.0.5)
activejob (7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.3.6)
activemodel (7.0.5)
activesupport (= 7.0.5)
activerecord (7.0.5)
activemodel (= 7.0.5)
activesupport (= 7.0.5)
activestorage (7.0.5)
actionpack (= 7.0.5)
activejob (= 7.0.5)
activerecord (= 7.0.5)
activesupport (= 7.0.5)
activemodel (7.0.5.1)
activesupport (= 7.0.5.1)
activerecord (7.0.5.1)
activemodel (= 7.0.5.1)
activesupport (= 7.0.5.1)
activestorage (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activesupport (= 7.0.5.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activestorage-scaleway-service (1.0.1)
activestorage
aws-sdk-s3
activesupport (7.0.5)
activesupport (7.0.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
......@@ -102,7 +102,7 @@ GEM
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
aws-eventstream (1.2.0)
aws-partitions (1.781.0)
aws-partitions (1.782.0)
aws-sdk-core (3.175.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
......@@ -271,7 +271,7 @@ GEM
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jmespath (1.6.2)
jquery-rails (4.5.1)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
......@@ -389,20 +389,20 @@ GEM
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.5)
actioncable (= 7.0.5)
actionmailbox (= 7.0.5)
actionmailer (= 7.0.5)
actionpack (= 7.0.5)
actiontext (= 7.0.5)
actionview (= 7.0.5)
activejob (= 7.0.5)
activemodel (= 7.0.5)
activerecord (= 7.0.5)
activestorage (= 7.0.5)
activesupport (= 7.0.5)
rails (7.0.5.1)
actioncable (= 7.0.5.1)
actionmailbox (= 7.0.5.1)
actionmailer (= 7.0.5.1)
actionpack (= 7.0.5.1)
actiontext (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activemodel (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
bundler (>= 1.15.0)
railties (= 7.0.5)
railties (= 7.0.5.1)
rails-autocomplete (2.0.1)
rails (>= 4.0)
rails-dom-testing (2.0.3)
......@@ -414,9 +414,9 @@ GEM
rails-i18n (7.0.7)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
railties (7.0.5)
actionpack (= 7.0.5)
activesupport (= 7.0.5)
railties (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
......@@ -526,7 +526,7 @@ GEM
httparty (~> 0.20)
oauth2 (>= 2.0.8)
uri (0.12.1)
vcr (6.1.0)
vcr (6.2.0)
version_gem (1.1.3)
warden (1.2.9)
rack (>= 2.0.9)
......
app/views/admin/communication/websites/pages/_form.html.erb
+ 16
− 18
View file @ bd85cf7a
......@@ -18,24 +18,22 @@ url = page.new_record? ? admin_communication_website_pages_path
<%= render 'admin/application/meta_description/form', f: f, about: page %>
</div>
<div class="col-md-4">
<% unless page.is_home? %>
<%= osuny_panel t('metadata') do %>
<%= f.input :published if page.draftable? %>
<%= f.input :slug,
as: :string,
required: true,
input_html: page.persisted? ? {} : {
class: 'js-slug-input',
data: { source: '#communication_website_page_title' }
} unless page.is_home? %>
<%= f.association :parent,
collection: collection_tree(@website.pages.for_language(current_website_language), page),
include_blank: false,
label_method: ->(p) { sanitize p[:label] },
value_method: ->(p) { p[:id] } unless page.is_home? %>
<%= f.input :bodyclass if can?(:edit, @website) %>
<%= f.input :full_width if page.editable_width? %>
<% end %>
<%= osuny_panel t('metadata') do %>
<%= f.input :published if page.draftable? %>
<%= f.input :slug,
as: :string,
required: true,
input_html: page.persisted? ? {} : {
class: 'js-slug-input',
data: { source: '#communication_website_page_title' }
} unless page.is_home? %>
<%= f.association :parent,
collection: collection_tree(@website.pages.for_language(current_website_language), page),
include_blank: false,
label_method: ->(p) { sanitize p[:label] },
value_method: ->(p) { p[:id] } unless page.is_home? %>
<%= f.input :bodyclass if can?(:edit, @website) %>
<%= f.input :full_width if page.editable_width? %>
<% end %>
<%= render 'admin/application/featured_image/edit', about: @page, f: f %>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment