Commit 94d2a3296d00a094d6dd226636ec493e5252a0f9

Authored by Andrey Karpikov
1 parent a96565a2

change kanjai version

... ... @@ -86,8 +86,6 @@ module Kanjai
86 86 type = item[2]
87 87 code = name.parameterize
88 88
89   -
90   -
91 89 template_part = page_template.template_parts.find_by_code(code)
92 90
93 91 if template_part
... ...
... ... @@ -10,7 +10,12 @@ module Kanjai
10 10 default_scope { order('code') }
11 11
12 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 19 end
15 20
16 21
... ...
... ... @@ -12,7 +12,7 @@
12 12 <% if Kanjai::PageLang.count > 0 %>
13 13 <li class="choose-lang">
14 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 16 </div>
17 17 </li>
18 18 <% end %>
... ...
1 1 module Kanjai
2   - VERSION = "0.0.239"
  2 + VERSION = "0.0.240"
3 3 end
... ...