EDIT / kanjai · Commits

Commit 1ffe9c0ca62aeece96a5814ecca9520c7120b5ae

Authored by Karpikau Andrei
1 parent cf72ea43

add domain

Inline Side-by-side
Showing 8 changed files with 14 additions and 14 deletions
... ... @@ -31,12 +31,12 @@ module Kanjai
31 31 end
32 32
33 33 page_data = @page.page_data.new(
34   - lang: PageLang.default,
  34 + lang: PageLang.default(@page.domain),
35 35 title: @page.title
36 36 )
37 37 page_data.save(:validate => false)
38 38
39   - redirect_to edit_admin_page_url(@page, lang: PageLang.default)
  39 + redirect_to edit_admin_page_url(@page, lang: PageLang.default(@page.domain) )
40 40 else
41 41 render :action => :new
42 42 end
... ... @@ -315,7 +315,7 @@ module Kanjai
315 315 def get_page_list(domain)
316 316 @pages = []
317 317 domain.pages.walk_tree do |page, level|
318   - @pages << {title: page.lang_attributes(PageLang.default, :title), level: level, id: page.id}
  318 + @pages << {title: page.lang_attributes(PageLang.default(domain), :title), level: level, id: page.id}
319 319 end
320 320 end
321 321
... ... @@ -323,7 +323,7 @@ module Kanjai
323 323 @pages = []
324 324 object = Page.find(params[:id])
325 325 domain.pages.where('id <> ?', object.id).walk_tree do |page, level|
326   - @pages << {title: page.lang_attributes(PageLang.default, :title), level: level, id: page.id}
  326 + @pages << {title: page.lang_attributes(PageLang.default(domain), :title), level: level, id: page.id}
327 327 end
328 328 end
329 329
... ...
... ... @@ -151,7 +151,7 @@ module Kanjai
151 151 ActionController::Base.helpers.concat(
152 152 ActionController::Base.helpers.content_tag(:li) do
153 153 ActionController::Base.helpers.concat(
154   - ActionController::Base.helpers.link_to (page.lang_attributes(PageLang.default, :title) + '<span class="caret"></span>').html_safe, page.menu_url($scheme, lang = nil), :class => 'dropdown-toggle', 'data-toggle' => "dropdown", 'role' => "button", 'aria-haspopup' => "true", 'aria-expanded' => "false"
  154 + ActionController::Base.helpers.link_to (page.lang_attributes(PageLang.default(page.domain), :title) + '<span class="caret"></span>').html_safe, page.menu_url($scheme, lang = nil), :class => 'dropdown-toggle', 'data-toggle' => "dropdown", 'role' => "button", 'aria-haspopup' => "true", 'aria-expanded' => "false"
155 155 )
156 156 ActionController::Base.helpers.concat(
157 157 ActionController::Base.helpers.content_tag(:ul) do
... ... @@ -166,7 +166,7 @@ module Kanjai
166 166 ActionController::Base.helpers.concat(
167 167 ActionController::Base.helpers.content_tag(:li) do
168 168 ActionController::Base.helpers.concat(
169   - ActionController::Base.helpers.link_to page.lang_attributes(PageLang.default, :title), page.menu_url($scheme, lang = nil)
  169 + ActionController::Base.helpers.link_to page.lang_attributes(PageLang.default(page.domain), :title), page.menu_url($scheme, lang = nil)
170 170 )
171 171 end
172 172 )
... ...
... ... @@ -7,7 +7,7 @@ module Kanjai
7 7
8 8 default_scope { order('code') }
9 9
10   - def self.default
  10 + def self.default(domain)
11 11 obj = domain.page_langs.where(:default_use => true).first
12 12 if obj.nil?
13 13 return 'en'
... ...
... ... @@ -2,9 +2,9 @@
2 2 <li class="dd-item dd3-item <%= page.active? ? '' : 'dd3-disabled' %>" data-id="<%= page.id %>">
3 3 <div class="dd-handle dd3-handle dd3-page-list-handle">&nbsp;</div>
4 4 <div class="dd3-content">
5   - <div class="text-in-one-string"><%= Kanjai::Page.human_attribute_name(:page_name) %>: <%= page.lang_attributes(Kanjai::PageLang.default, :title) %></div>
  5 + <div class="text-in-one-string"><%= Kanjai::Page.human_attribute_name(:page_name) %>: <%= page.lang_attributes(Kanjai::PageLang.default(page.domain), :title) %></div>
6 6 <div class="text-in-one-string"><%= Kanjai::Page.human_attribute_name(:template_name) %>: <%= page.page_template.title if page.page_template %></div>
7   - <div class="text-in-one-string"><%= Kanjai::Page.human_attribute_name(:title_url) %>: <%= page.lang_attributes(Kanjai::PageLang.default, :url) %></div>
  7 + <div class="text-in-one-string"><%= Kanjai::Page.human_attribute_name(:title_url) %>: <%= page.lang_attributes(Kanjai::PageLang.default(page.domain), :url) %></div>
8 8 </div>
9 9 <div class="dd3-action">
10 10 <div class="dropdown">
... ... @@ -20,7 +20,7 @@
20 20 <% end %>
21 21 </li>
22 22 <li class="dropdown-item">
23   - <%= link_to t('actions.edit'), edit_admin_page_url(page, :lang => Kanjai::PageLang.default), class: 'dropdown-item' %>
  23 + <%= link_to t('actions.edit'), edit_admin_page_url(page, :lang => Kanjai::PageLang.default(page.domain)), class: 'dropdown-item' %>
24 24 </li>
25 25 <li class="dropdown-item">
26 26 <%= link_to t('actions.duplicate'), clone_admin_page_url(page), class: 'dropdown-item' %>
... ...
... ... @@ -5,7 +5,7 @@
5 5
6 6 <div class="card card-default">
7 7 <div class="card-header">
8   - <div class="card-title"><%= t('admin.pages.edit', title: @page.lang_attributes(Kanjai::PageLang.default, :title)) %></div>
  8 + <div class="card-title"><%= t('admin.pages.edit', title: @page.lang_attributes(Kanjai::PageLang.default(@page.domain), :title)) %></div>
9 9 </div>
10 10 <%= render partial: 'form' %>
11 11 </div>
... ...
1 1 <div class="container">
2 2
3   - <h3><%= t('admin.pages.edit_page', title: @page.lang_attributes(Kanjai::PageLang.default, :title)) %></h3>
  3 + <h3><%= t('admin.pages.edit_page', title: @page.lang_attributes(Kanjai::PageLang.default(@page.domain), :title)) %></h3>
4 4
5 5
6 6 <div class="row">
... ...
1 1 <div class="container">
2 2
3   - <h3><%= t('admin.pages.edit_page', title: @page.lang_attributes(Kanjai::PageLang.default, :title)) %></h3>
  3 + <h3><%= t('admin.pages.edit_page', title: @page.lang_attributes(Kanjai::PageLang.default(@page.domain), :title)) %></h3>
4 4
5 5 <div class="row">
6 6 <div class="col-md-10 html-generator" data-editor-url="<%= show_editor_admin_page_url(@page_data.page, lang: params[:lang]) %>" data-save_url="<%= save_structure_admin_page_url(@page_data.page, lang: params[:lang]) %>" data-delete_cell_url="<%= delete_content_admin_page_url(@page_data.page, lang: params[:lang]) %>" data-duplicate-url="<%= duplicate_block_admin_page_url(@page_data.page, lang: params[:lang]) %>" >
... ...
1 1 module Kanjai
2   - VERSION = "0.0.202"
  2 + VERSION = "0.0.203"
3 3 end
... ...