Skip to content
Snippets Groups Projects
Commit 7428d81a authored by alexisben's avatar alexisben
Browse files

merge

parents fabedab2 084b8c72
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ template ||= @block.template
root_template = template == @block.template
if root_template
model = 'data'
dom_id = "#{property}"
dom_id = "'#{property}'"
i18n_component = "#{i18n}.#{property}"
else
# Nested element
......
......@@ -3,7 +3,9 @@
class="form-check-input"
v-model="<%= model %>.<%= property %>"
type="checkbox" />
<label class="form-label" aria-label="<%= label %>" :for="<%= dom_id.html_safe %>">
<label class="form-label"
aria-label="<%= label %>"
:for="<%= dom_id.html_safe %>">
<%= label %>
</label>
</div>
\ No newline at end of file
......@@ -22,13 +22,9 @@ layouts = template.class.layouts
v-model="data.layout"
value="<%= layout %>"
id="layout-<%= layout %>">
<h3 class="h4">
<%= name %>
</h3>
<h3 class="h4"><%= name %></h3>
</div>
<p>
<%= description %>
</p>
<p><%= description %></p>
</div>
</div>
<div class="col-4 col-xxl-6">
......
<label class="form-label" aria-label="<%= label %>" :for="<%= dom_id.html_safe %>">
<label class="form-label"
aria-label="<%= label %>"
:for="<%= dom_id.html_safe %>">
<%= label %>
</label>
<div class="summernote mb-3">
......
<label class="form-label" aria-label="<%= label %>" :for="<%= dom_id.html_safe %>">
<label class="form-label"
aria-label="<%= label %>"
:for="<%= dom_id.html_safe %>">
<%= label%>
</label>
<input :id="<%= dom_id.html_safe %>"
......
<% rows ||= 3 %>
<label class="form-label" aria-label="<%= label %>" :for="<%= dom_id.html_safe %>">
<label class="form-label"
aria-label="<%= label %>"
:for="<%= dom_id.html_safe %>">
<%= label %>
</label>
<textarea :id="<%= dom_id.html_safe %>"
......
......@@ -26,7 +26,7 @@
</div>
<div class="card-body">
<div class="flex-fill">
<div class="row">
<div class="row mb-n3">
<div class="col-lg-6">
<%= block_component_edit :image,
template: @element,
......
......@@ -11,7 +11,7 @@
</a>
</div>
<div class="flex-fill">
<div class="row">
<div class="row mb-n3">
<div class="col-lg-4">
<%= block_component_edit :text, template: element %>
</div>
......
......@@ -8,15 +8,15 @@ namespace :app do
desc 'Fix things'
task fix: :environment do
University::Person.find_each do |person|
person.is_author = person.communication_website_posts.any?
person.save
end
# University::Person.find_each do |person|
# person.is_author = person.communication_website_posts.any?
# person.save
# end
Communication::Website::Page.where("header_text ILIKE ?", "%<p>%").find_each { |page|
clean_header_text = ActionController::Base.helpers.strip_tags(page.header_text)
page.update(header_text: clean_header_text)
}
# Communication::Website::Page.where("header_text ILIKE ?", "%<p>%").find_each { |page|
# clean_header_text = ActionController::Base.helpers.strip_tags(page.header_text)
# page.update(header_text: clean_header_text)
# }
BlocksMigration.cleanup
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment