spen
/
seminar
1
0
Fork 6
Code Issues Pull Requests Packages Projects Releases Wiki Activity

master #18

Merged
chiu merged 2 commits from 123/seminar:master into master 2024-04-09 13:06:07 +00:00
Conversation 0 Commits 2 Files Changed 4 +4 -4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/seminars/_attribute_field.html.erb
View File

@ -147,7 +147,7 @@
<% @site_in_use_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<% active = (locale == @site_in_use_locales.first ? "active in" : "'") %> <% active = (locale == @site_in_use_locales.first ? "active in" : "'") %>
<%= content_tag :div, {class: "tab-pane fade #{active}", id: "#{name_to_id(typeG_field_name)}_#{locale}"} do %> <%= content_tag :div, {class: "tab-pane fade #{active}", id: "#{name_to_id(typeG_field_name)}_#{locale}"} do %>
<% locale_value = attribute_field["typeG"]["instructions"][locale.to_s] %> <% locale_value = (attribute_field["typeG"].present? ? attribute_field["typeG"]["instructions"][locale.to_s] : "") %>
<%= text_area(typeG_field_name, locale, value: locale_value, placeholder: "#{t(locale).to_s}", data: {:type=>"lang_#{locale}"}, class: 'ckeditor') %> <%= text_area(typeG_field_name, locale, value: locale_value, placeholder: "#{t(locale).to_s}", data: {:type=>"lang_#{locale}"}, class: 'ckeditor') %>
<% end %> <% end %>
<% end %> <% end %>

2
app/views/admin/seminars/_attribute_submission_field.html.erb
View File

@ -160,7 +160,7 @@
<% @site_in_use_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<% active = (locale == @site_in_use_locales.first ? "active in" : "'") %> <% active = (locale == @site_in_use_locales.first ? "active in" : "'") %>
<%= content_tag :div, {class: "tab-pane fade #{active}", id: "#{name_to_id(typeG_field_name)}_#{locale}"} do %> <%= content_tag :div, {class: "tab-pane fade #{active}", id: "#{name_to_id(typeG_field_name)}_#{locale}"} do %>
<% locale_value = attribute_submission_field["typeG"]["instructions"][locale.to_s] %> <% locale_value = (attribute_submission_field["typeG"].present? ? attribute_submission_field["typeG"]["instructions"][locale.to_s] : "") %>
<%= text_area(typeG_field_name, locale, value: locale_value, placeholder: "#{t(locale).to_s}", data: {:type=>"lang_#{locale}"}, class: 'ckeditor') %> <%= text_area(typeG_field_name, locale, value: locale_value, placeholder: "#{t(locale).to_s}", data: {:type=>"lang_#{locale}"}, class: 'ckeditor') %>
<% end %> <% end %>
<% end %> <% end %>

2
custom_gallery/app/controllers/admin/custom_galleries_controller.rb
View File

@ -502,7 +502,7 @@ class Admin::CustomGalleriesController < OrbitAdminController
theater_link: admin_image_path(values), theater_link: admin_image_path(values),
description: values.description, description: values.description,
title: values.title, title: values.title,
file: values.file.as_json[:file], file: values.file.as_json,
custom_gallery_custom_album_id: values.custom_album_id, custom_gallery_custom_album_id: values.custom_album_id,
order: values.order, order: values.order,
tags: values.tags} tags: values.tags}

2
custom_gallery/app/controllers/custom_galleries_controller.rb
View File

@ -242,7 +242,7 @@ class CustomGalleriesController < ApplicationController
title: values.title, title: values.title,
alt_title: alt_text, alt_title: alt_text,
url: values.file.url, url: values.file.url,
file: values.file.as_json[:file], file: values.file.as_json,
custom_gallery_custom_album_id: values.custom_album_id, custom_gallery_custom_album_id: values.custom_album_id,
tags: values.tags} tags: values.tags}
end end