Showing
4 changed files
with
8 additions
and
5 deletions
| @@ -86,8 +86,6 @@ module Kanjai | @@ -86,8 +86,6 @@ module Kanjai | ||
| 86 | type = item[2] | 86 | type = item[2] |
| 87 | code = name.parameterize | 87 | code = name.parameterize |
| 88 | 88 | ||
| 89 | - | ||
| 90 | - | ||
| 91 | template_part = page_template.template_parts.find_by_code(code) | 89 | template_part = page_template.template_parts.find_by_code(code) |
| 92 | 90 | ||
| 93 | if template_part | 91 | if template_part |
| @@ -10,7 +10,12 @@ module Kanjai | @@ -10,7 +10,12 @@ module Kanjai | ||
| 10 | default_scope { order('code') } | 10 | default_scope { order('code') } |
| 11 | 11 | ||
| 12 | def self.default(domain) | 12 | def self.default(domain) |
| 13 | - return 'en' | 13 | + obj = domain.page_langs.where(:default_use => true).first |
| 14 | + if obj.nil? | ||
| 15 | + return 'en' | ||
| 16 | + else | ||
| 17 | + return obj.code | ||
| 18 | + end | ||
| 14 | end | 19 | end |
| 15 | 20 | ||
| 16 | 21 |
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | <% if Kanjai::PageLang.count > 0 %> | 12 | <% if Kanjai::PageLang.count > 0 %> |
| 13 | <li class="choose-lang"> | 13 | <li class="choose-lang"> |
| 14 | <div class="text-right"> | 14 | <div class="text-right"> |
| 15 | - <%= select_tag :choose_lang, options_for_select(Kanjai::PageLang.all.collect{|lang| [lang.title, lang.code, data: {url: edit_admin_page_template_url(@page_template, lang: lang.code)}] }, params[:lang]), class: 'form-control' %> | 15 | + <%= select_tag :choose_lang, options_for_select(Kanjai::PageLang.all.collect{|lang| [lang.title, lang.code, data: {url: edit_admin_page_template_url(@page_template, lang: lang.code)}] }, params[:lang]), include_blank: true, class: 'form-control' %> |
| 16 | </div> | 16 | </div> |
| 17 | </li> | 17 | </li> |
| 18 | <% end %> | 18 | <% end %> |