developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bugs for i18n_variable in page and home

This commit is contained in:
rulingcom 2011-01-31 10:57:41 +08:00 committed by ihower
parent bda67684bd
commit c44b86f284
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/home.rb
View File

@ -6,5 +6,5 @@ class Home < Page
def validates_presence_of_parent_id? def validates_presence_of_parent_id?
false false
end end
end end

2
app/models/item.rb
View File

@ -60,7 +60,7 @@ class Item
# Check if the page is home # Check if the page is home
def is_home? def is_home?
self.name.eql?('home') && self.parent_id.nil? self.name.eql?('home') && (self.parent_id.nil? || self.parent_id.empty?)
end end
# Build the url from the array of ancestors # Build the url from the array of ancestors

4
app/views/admin/homes/_form.html.erb
View File

@ -9,8 +9,8 @@
<% @site_valid_locales.each do |locale| %> <% @site_valid_locales.each do |locale| %>
<p> <p>
<%= label_tag "#{f}[title]", "#{t('admin.title')} #{locale}" %> <%= label_tag "home[title]", "#{t('admin.title')} #{locale}" %>
<%= text_field_tag "#{f}[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :class => 'text' %> <%= text_field_tag "home[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :class => 'text' %>
</p> </p>
<% end %> <% end %>

6
app/views/admin/pages/_form.html.erb
View File

@ -2,7 +2,7 @@
<p> <p>
<%= f.label :name, t('admin.name') %> <%= f.label :name, t('admin.name') %>
<% if @page.parent_id.nil? %> <% if @page.parent_id.nil? || @page.parent_id.empty? %>
<%= f.text_field :name, :class => 'text', :value => 'home', :disabled => true %> <%= f.text_field :name, :class => 'text', :value => 'home', :disabled => true %>
<%= f.hidden_field :name, :value => 'home' %> <%= f.hidden_field :name, :value => 'home' %>
<% else %> <% else %>
@ -13,8 +13,8 @@
<% @site_valid_locales.each do |locale| %> <% @site_valid_locales.each do |locale| %>
<p> <p>
<%= label_tag "#{f}[title]", "#{t('admin.title')} #{locale}" %> <%= label_tag "page[title]", "#{t('admin.title')} #{locale}" %>
<%= text_field_tag "#{f}[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :class => 'text' %> <%= text_field_tag "page[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :class => 'text' %>
</p> </p>
<% end %> <% end %>