From b9cf5263f67b2653c4bfefec8cfa7c5530105015 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Jul 2012 02:27:43 +0800 Subject: [PATCH 01/15] Remove i18n_variable for announcement --- app/controllers/orbit_backend_controller.rb | 24 ++---- lib/tasks/migrate.rake | 83 +++++++++++++++++++ .../back_end/approvals_controller.rb | 2 +- .../announcement/back_end/bulletins_helper.rb | 4 +- .../app/models/announcement_tag.rb | 2 +- .../announcement/app/models/bulletin.rb | 36 ++------ .../app/models/bulletin_category.rb | 11 +-- .../announcement/app/models/bulletin_file.rb | 34 +------- .../announcement/app/models/bulletin_link.rb | 4 +- .../announcement/app/models/bulletin_tag.rb | 14 ---- .../app/models/unit_list_for_anc.rb | 3 +- .../_bulletin_category.html.erb | 2 +- .../bulletin_categorys/_form.html.erb | 4 +- .../_quick_edit_qe.html.erb | 4 +- .../back_end/bulletins/_bulletin.html.erb | 2 +- .../bulletins/_bulletin_file_qe.html.erb | 8 +- .../bulletins/_bulletin_link_qe.html.erb | 6 +- .../back_end/bulletins/_file.html.erb | 2 +- .../bulletins/_filter_categories.html.erb | 2 +- .../back_end/bulletins/_form.html.erb | 12 +-- .../bulletins/_form_bulletin_file.html.erb | 8 +- .../bulletins/_form_bulletin_link.html.erb | 4 +- .../bulletins/_list_bulletin_file.html.erb | 4 +- .../bulletins/_list_bulletin_link.html.erb | 4 +- .../bulletins/_quick_edit_basic.html.erb | 6 +- .../back_end/bulletins/show.html.erb | 12 +-- .../front_end/bulletins/index.html.erb | 6 +- .../front_end/bulletins/show.html.erb | 8 +- .../widget/bulletins/_bulletins.html.erb | 2 +- .../widget/bulletins/_index.html.erb | 4 +- .../widget/bulletins/_web_links.html.erb | 2 +- .../widget/bulletins/bulletins_list.html.erb | 2 +- .../bulletins/bulletins_side_bar.html.erb | 2 +- 33 files changed, 163 insertions(+), 160 deletions(-) create mode 100644 lib/tasks/migrate.rake delete mode 100644 vendor/built_in_modules/announcement/app/models/bulletin_tag.rb diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb index feefc98e6..6bc42ec91 100644 --- a/app/controllers/orbit_backend_controller.rb +++ b/app/controllers/orbit_backend_controller.rb @@ -39,11 +39,10 @@ class OrbitBackendController< ApplicationController options = [options] if !options.class.eql?(Array) options.each do |option| if object_class.fields.include?(option) - case object_class.fields[option].type.to_s - when 'BigDecimal', 'Boolean', 'Date', 'DateTime', 'Float', 'Integer', 'String', 'Symbol', 'Time' - (objects = objects.order_by(option, params[:direction])) rescue nil - when 'Object' - objects = get_objects_from_referenced_objects(object_class.fields[option].options[:class_name].constantize, objects, option) + if object_class.fields[option].type.to_s.eql?('Object') && !object_class.relations[option].nil? + objects = get_objects_from_referenced_objects(object_class.fields[option].options[:class_name].constantize, objects, option) + else + (objects = objects.order_by(option, params[:direction])) rescue nil end elsif object_class.relations.include?(option) case object_class.relations[option].macro @@ -92,20 +91,11 @@ class OrbitBackendController< ApplicationController end def get_string_value_from_object(object) - s = object[I18n.locale] rescue nil - s = object.i18n_variable unless s rescue nil + s = object.name_translations[I18n.locale.to_s] unless s rescue nil + s = object.title_translations[I18n.locale.to_s] unless s rescue nil s = object.name unless s rescue nil s = object.title unless s rescue nil - if s - case s.class.to_s - when "String" - s.downcase rescue '' - when "I18nVariable" - s[I18n.locale].downcase rescue '' - else - nil - end - end + s.downcase rescue '' end def get_objects_from_referenced_objects(object_class, objects, option) diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake new file mode 100644 index 000000000..b8858ad82 --- /dev/null +++ b/lib/tasks/migrate.rake @@ -0,0 +1,83 @@ +# encoding: utf-8 + +namespace :migrate do + + task :i18n => :environment do + + p 'Start Bulletin' + bulletins = Bulletin.admin_manager_all + i = 1 + bulletins.each do |bulletin| + p "#{i}/#{bulletins.size} - #{bulletin.id}" + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle + text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text + bulletin.save(:validate => false) + i += 1 + end + p 'End Bulletin' + + p '=====================================================' + + p 'Start BulletinCategory' + categories = BulletinCategory.admin_manager_all + i = 1 + categories.each do |category| + p "#{i}/#{categories.size} - #{category.id}" + title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + category.save(:validate => false) + i += 1 + end + p 'End BulletinCategory' + + p '=====================================================' + + p 'Start BulletinFile' + files = BulletinFile.all + i = 1 + files.each do |file| + p "#{i}/#{files.size} - #{file.id}" + description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + file.save(:validate => false) + i += 1 + end + p 'End BulletinFile' + + p '=====================================================' + + p 'Start BulletinLink' + links = BulletinLink.all + i = 1 + links.each do |link| + p "#{i}/#{links.size} - #{link.id}" + title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) + link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + link.save(:validate => false) + i += 1 + end + p 'End BulletinLink' + + p '=====================================================' + + p 'Start UnitListForAnc' + units = UnitListForAnc.all + i = 1 + units.each do |unit| + p "#{i}/#{units.size} - #{unit.id}" + title = I18nVariable.first(:conditions => {:language_value_id => unit.id, :language_value_type => unit.class}) + unit.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + unit.save(:validate => false) + i += 1 + end + p 'End UnitListForAnc' + + end + +end diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb index 0246ab7ce..f787ff280 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/approvals_controller.rb @@ -26,7 +26,7 @@ class Panel::Announcement::BackEnd::ApprovalsController < OrbitBackendControlle def setting @sys_users = User.all(conditions: {admin: false}).includes(:avatar) @bulletin_categorys = BulletinCategory.all - @options_from_collection_for_select_bulletin_categorys = @bulletin_categorys.collect{|bc| [bc.i18n_variable[I18n.locale],bc.id] } + @options_from_collection_for_select_bulletin_categorys = @bulletin_categorys.collect{|bc| [bc.title,bc.id] } if params.has_key? :category @bulletin_category = BulletinCategory.find params[:category][:id] else diff --git a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb index 3f57fd3af..5de4a8260 100644 --- a/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb +++ b/vendor/built_in_modules/announcement/app/helpers/panel/announcement/back_end/bulletins_helper.rb @@ -14,9 +14,9 @@ module Panel::Announcement::BackEnd::BulletinsHelper def show_bulletin_title_at_index (bulletin) if bulletin.is_checked? - link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue '' + link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue '' else - bulletin.title[I18n.locale] + bulletin.title end end diff --git a/vendor/built_in_modules/announcement/app/models/announcement_tag.rb b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb index 630779d15..594c221d4 100644 --- a/vendor/built_in_modules/announcement/app/models/announcement_tag.rb +++ b/vendor/built_in_modules/announcement/app/models/announcement_tag.rb @@ -3,7 +3,7 @@ class AnnouncementTag < Tag has_and_belongs_to_many :bulletins field :order,:default => 0 - def get_visible_bulletins(sort = :name) + def get_visible_bulletins(sort = :title) date_now = Time.now self.bulletins.where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort) end diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb index a6b0e55f6..e7ff24dc3 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb @@ -15,9 +15,10 @@ class Bulletin is_impressionable :counter_cache => { :column_name => :view_count } - has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :subtitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + field :title, localize: true + field :subtitle, localize: true + field :text, localize: true + has_and_belongs_to_many :tags, :class_name => "AnnouncementTag" field :postdate , :type => DateTime @@ -55,9 +56,9 @@ class Bulletin accepts_nested_attributes_for :bulletin_files, :allow_destroy => true accepts_nested_attributes_for :bulletin_links, :allow_destroy => true - validates_presence_of :title + validates :title, :presence => true - before_save :set_key,:check_deadline,:update_status + before_save :check_deadline,:update_status after_save :save_bulletin_links after_save :save_bulletin_files @@ -157,19 +158,6 @@ end end end end - - - def title - @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def subtitle - @subtitle ||= I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def text - @text ||= I18nVariable.first(:conditions => {:key => 'text', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end def self.filter(bulletins) bulletins.each do |bulletin| @@ -191,18 +179,6 @@ end end - def set_key - if title && title.new_record? - title.key = 'title' - end - if subtitle && subtitle.new_record? - subtitle.key = 'subtitle' - end - if text && text.new_record? - text.key = 'text' - end - end - def update_status if !self.is_pending if !self.is_checked diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb index 2f25c8882..7de9bb2c5 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb @@ -13,18 +13,15 @@ class BulletinCategory PAYMENT_TYPES = [ "List", "Picture" ] APP_NAME = 'Announcement' - field :key + field :disable, type: Boolean, :default => false field :display - field :disable,type: Boolean,:default => false - - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + field :key + field :title, localize: true has_many :bulletins - - def pp_object - i18n_variable[I18n.locale] + name end def self.from_id(id) diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb index a30ec1311..2912fc976 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb @@ -4,37 +4,11 @@ class BulletinFile include Mongoid::Timestamps mount_uploader :file, AssetUploader - - # field :filetitle - # field :description - has_one :filetitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :description, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - - # field :to_save, :type => Boolean - field :should_destroy, :type => Boolean + + field :description, localize: true + field :should_destroy, :type => Boolean + field :title, localize: true belongs_to :bulletin - # embedded_in :bulletin - - before_save :set_key - - def filetitle - @filetitle ||= I18nVariable.first(:conditions => {:key => 'filetitle', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def description - @description ||= I18nVariable.first(:conditions => {:key => 'description', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - protected - - def set_key - if filetitle && filetitle.new_record? - filetitle.key = 'filetitle' - end - if description && description.new_record? - description.key = 'description' - end - end end diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb index 303631820..47a447893 100644 --- a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb +++ b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb @@ -4,9 +4,7 @@ class BulletinLink include Mongoid::Timestamps field :url - # field :name - - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + field :title, localize: true field :should_destroy, :type => Boolean diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_tag.rb b/vendor/built_in_modules/announcement/app/models/bulletin_tag.rb deleted file mode 100644 index 406642620..000000000 --- a/vendor/built_in_modules/announcement/app/models/bulletin_tag.rb +++ /dev/null @@ -1,14 +0,0 @@ -class AnnouncementTag < Tag - - has_and_belongs_to_many :bulletins - - - def get_visible_bulletins(sort = :name) - date_now = Time.now - self.bulletins.all.where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort) - end - - def bulletins - Bulletin.all.any_in(:_id => bulletin_ids) - end -end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb b/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb index 5261f6a2a..179e95886 100644 --- a/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb +++ b/vendor/built_in_modules/announcement/app/models/unit_list_for_anc.rb @@ -5,8 +5,7 @@ class UnitListForAnc field :order field :ut_code field :up_ut_code - - has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true + field :title, localize: true end \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb index 58a9a5f9b..a0f021a8f 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb @@ -15,6 +15,6 @@ <% @site_valid_locales.each do |locale| %> - <%= bulletin_category.i18n_variable[locale] rescue nil %> + <%= bulletin_category.title_translations[locale] rescue nil %> <% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb index 1fbf5e2ee..0de7d2e85 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb @@ -10,12 +10,12 @@
- <%= f.fields_for :i18n_variable, (@bulletin_category.new_record? ? @bulletin_category.build_i18n_variable : @bulletin_category.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
- <%= f.text_field locale, :class => 'input-xxlarge' %> + <%= f.text_field locale, :class => 'input-xxlarge', :value => (@bulletin_category.title_translations[locale] rescue nil) %>
<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb index cb32d861a..9e774709f 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb @@ -7,12 +7,12 @@ <%= f.text_field :key %>
- <%= f.fields_for :i18n_variable, bulletin_category.i18n_variable do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
<%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
- <%= f.text_field locale, :class => 'input-xxlarge' %> + <%= f.text_field locale, :class => 'input-xxlarge', :value => (bulletin_category.title_translations[locale] rescue nil) %>
<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb index edff4d2d5..545067794 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb @@ -28,7 +28,7 @@
- <%= bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %> + <%= bulletin.bulletin_category.title rescue nil %> <%= show_bulletin_title_at_index bulletin%>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb index 23229b5da..547736ffe 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb @@ -13,23 +13,23 @@
- <%= f.fields_for :filetitle, (@bulletin_file.new_record? ? @bulletin_file.build_filetitle : @bulletin_file.filetitle ) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge" %> + <%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge", :value => (@bulletin_file.title_translations[locale] rescue nil) %>
<% end %> <% end %> - <%= f.fields_for :description, (@bulletin_file.new_record? ? @bulletin_file.build_description : @bulletin_file.description ) do |f| %> + <%= f.fields_for :description_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge" %> + <%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge", :value => (@bulletin_file.description_translations[locale] rescue nil) %>
<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb index fd013f56c..c89ba8a58 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb @@ -14,13 +14,13 @@ - <%= f.fields_for :i18n_variable, (@bulletin_link.new_record? ? @bulletin_link.build_i18n_variable : @bulletin_link.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> + <%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}" %>
<%#= f.text_field locale, :class => 'input-xxlarge' %> - <%= f.text_field locale %> + <%= f.text_field locale, :class => 'control-label', :value => (@bulletin_link.title_translations[locale] rescue nil) %>
<% end %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb index 537178484..c18852877 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb @@ -11,7 +11,7 @@ <%= f.file_field :file %> <%= f.label :file_title %> - <%= f.text_field :filetitle %> + <%= f.text_field :title %> <%= f.label :file_description %> <%= f.text_field :description %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb index 7856f74b4..b07275014 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb @@ -1,6 +1,6 @@
<% @bulletin_categories.each do |category| -%> - <%= link_to category.i18n_variable[I18n.locale], panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'categories', :id => category.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('categories', category.id)}" %> + <%= link_to category.title, panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'categories', :id => category.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('categories', category.id)}" %> <% end -%>
<%= render :partial => 'clear_filters', :locals => {:type => 'categories'} %> \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index 73d088b74..f58cfe2b5 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -121,10 +121,10 @@
<%#= f.label :unit_list_for_anc%> - <%#= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %> + <%#= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title, t.id ]}, {}, :class => "input-medium" %> <%= f.label :category,t('announcement.bulletin.category')%> - <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %> + <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.title, t.id ]}, {}, :class => "input-medium" %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb index 9523fd9a5..588c34f08 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb @@ -17,7 +17,7 @@
next
diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb index 5ea1a930c..69496365b 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_side_bar.html.erb @@ -4,7 +4,7 @@ From 4a6b9fbe643f12c9d3c69db43ae887cb857cce2a Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Jul 2012 03:47:14 +0800 Subject: [PATCH 04/15] Remove i18n_variable for page_content --- lib/tasks/migrate.rake | 15 +++++++++++++++ .../page_content/app/models/page_context.rb | 4 ++-- .../back_end/page_contexts/_form.html.erb | 6 +++--- .../back_end/page_contexts/_page_context.html.erb | 2 +- .../page_contexts/_view_page_context.html.erb | 2 +- .../back_end/page_contexts/show.html.erb | 4 ++-- .../front_end/page_contexts/index.html.erb | 4 ++-- 7 files changed, 26 insertions(+), 11 deletions(-) diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index 485db8c86..da664bab4 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -141,6 +141,21 @@ namespace :migrate do end p 'End NewsBulletinLink' + p '=====================================================' + p '=====================================================' + + p 'Start PageContext' + page_contexts = PageContext.admin_manager_all + i = 1 + page_contexts.each do |page_context| + p "#{i}/#{page_contexts.size} - #{page_context.id}" + context = I18nVariable.first(:conditions => {:language_value_id => page_context.id, :language_value_type => page_context.class}) + page_context.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context + page_context.save(:validate => false) + i += 1 + end + p 'End PageContext' + end end diff --git a/vendor/built_in_modules/page_content/app/models/page_context.rb b/vendor/built_in_modules/page_content/app/models/page_context.rb index be60db27b..7c9bde354 100644 --- a/vendor/built_in_modules/page_content/app/models/page_context.rb +++ b/vendor/built_in_modules/page_content/app/models/page_context.rb @@ -9,7 +9,7 @@ class PageContext is_impressionable :counter_cache => { :column_name => :view_count } - has_one :context, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + field :context, localize: true field :create_user_id field :update_user_id @@ -26,7 +26,7 @@ class PageContext ObjectAuthTitlesOptions = %W{Edit} def pp_object - page.i18n_variable[I18n.locale] + page.title end def is_top? diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index 835b05114..f1dc08224 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -6,7 +6,7 @@
<%= f.label :name %> - <%= @page_context.page.i18n_variable[I18n.locale] %> + <%= @page_context.page.title %>
    @@ -23,9 +23,9 @@
    <%= f.label :context %> - <%= f.fields_for :context, (@page_context.new_record? ? @page_context.build_context : @page_context.context ) do |f| %> + <%= f.fields_for :context_translations do |f| %> <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea' %> + <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea':value => (@page_context.context_translations[locale] rescue nil) %> <% end %>
    diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb index d1114a4a1..ec61ef534 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb @@ -1,7 +1,7 @@ <%= page_context.page.path %>
    - <%= page_context.page.i18n_variable[I18n.locale] %> + <%= page_context.page.title %>
      <%if is_manager? || is_admin? || page_context.authed_users(:edit).include?(current_user)%> diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb index 38d83b294..56ec11e3c 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_view_page_context.html.erb @@ -2,7 +2,7 @@ - <%= view_page_context.page.i18n_variable[I18n.locale] %> + <%= view_page_context.page.title %>
      • <%= link_to t('view_page_context.show'), panel_page_content_back_end_page_context_path(view_page_context) %>
        • diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb index 0c681faf6..913be9835 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/show.html.erb @@ -9,11 +9,11 @@
        • <%= t('page_content.name') %> - <%= @page_context.page.i18n_variable[I18n.locale] %> + <%= @page_context.page.title %>
        • <%= t('page_content.context') %> - <%= @page_context.context[I18n.locale].html_safe %> + <%= @page_context.context.html_safe %>
        • <%= t('page_content.張貼者') %> diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb index 474ace53e..6648b46b6 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/front_end/page_contexts/index.html.erb @@ -4,8 +4,8 @@

          <%= flash_messages %>

          <%= dislpay_view_count(@page_context) %>
          -

          <%= @page_context.page.i18n_variable[I18n.locale] rescue nil %>

          +

          <%= @page_context.page.title rescue nil %>

          -
          <%= @page_context.context[I18n.locale].html_safe rescue nil %>
          +
          <%= @page_context.context.html_safe rescue nil %>
          From 3466a19362373f1aae1323b2bc606c05f21b1b18 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Jul 2012 04:10:02 +0800 Subject: [PATCH 05/15] Fix error in i18n_variable removal for page_content --- .../panel/page_content/back_end/page_contexts/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index f1dc08224..d41fb6d9c 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -25,7 +25,7 @@ <%= f.label :context %> <%= f.fields_for :context_translations do |f| %> <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea':value => (@page_context.context_translations[locale] rescue nil) %> + <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea', :value => (@page_context.context_translations[locale] rescue nil) %> <% end %>
      From a1cf0a3eb6ce754b112990fe5c7b26be4a095633 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Jul 2012 04:10:15 +0800 Subject: [PATCH 06/15] Remove i18n_variable for web_resource --- lib/tasks/migrate.rake | 17 +++++ .../back_end/web_links_controller.rb | 70 ------------------- .../front_end/web_links_controller.rb | 2 +- .../widget/web_links_controller.rb | 2 +- .../web_resource/app/models/web_link.rb | 39 ++--------- .../app/models/web_link_category.rb | 4 +- .../app/models/web_resource_tag.rb | 2 +- .../web_link_categorys/_form.html.erb | 4 +- .../_web_link_category.html.erb | 2 +- .../back_end/web_links/_form.html.erb | 8 +-- .../back_end/web_links/_sort_headers.html.erb | 2 +- .../back_end/web_links/_web_link.html.erb | 4 +- .../back_end/web_links/show.html.erb | 57 --------------- .../front_end/web_links/index.html.erb | 6 +- .../front_end/web_links/show.html.erb | 57 --------------- .../widget/web_links/_web_links.html.erb | 2 +- .../widget/web_links/index.html.erb | 6 +- 17 files changed, 46 insertions(+), 238 deletions(-) diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index da664bab4..b9cbb6053 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -156,6 +156,23 @@ namespace :migrate do end p 'End PageContext' + p '=====================================================' + p '=====================================================' + + p 'Start WebLink' + links = WebLink.admin_manager_all + i = 1 + links.each do |link| + p "#{i}/#{links.size} - #{link.id}" + name = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class}) + link.name_translations = {'en' => name['en'], 'zh_tw' => name['zh_tw']} if name + context = I18nVariable.first(:conditions => {:key => 'context', :language_value_id => link.id, :language_value_type => link.class}) + link.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context + link.save(:validate => false) + i += 1 + end + p 'End WebLink' + end end diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb index 40db805fa..ef96e7d35 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb @@ -161,75 +161,5 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController module_app = ModuleApp.first(:conditions => {:key => 'web_resource'}) @tags = Tag.all(:conditions => {:module_app_id => module_app.id}) end - - def get_sorted_and_filtered_web_links - web_links = WebLink.all - case params[:sort] - when 'category' - category_ids = web_links.distinct(:web_link_category_id) - categories = WebLinkCategory.find(category_ids) rescue nil - if categories - h = Hash.new - categories.each { |category| h[category.i18n_variable[I18n.locale]] = category.id } - sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! - sorted_categorys = sorted.collect {|a| web_links.where(:web_link_category_id => a[1]).entries } - web_links = sorted_categorys.flatten! - end - when 'name' - h = Array.new - web_links.each { |web_link| h << [web_link.name[I18n.locale].downcase, web_link] } - sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse! - web_links = sorted.collect {|a| a[1] } - when 'status' - web_links = web_links.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction]).order_by(:is_pending, params[:direction]).order_by(:is_checked, params[:direction]).order_by(:is_rejected, params[:direction]) - when 'tags' - a = Array.new - WebResourceTag.all.order_by(I18n.locale, params[:direction]).each { |tag| a << tag.web_links } - a.flatten! - a.uniq! - tmp = Array.new - web_links.where(:tag_ids => []).each { |web_link| tmp << [web_link.name[I18n.locale].downcase, web_link] } - sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse! - sorted_names = sorted.collect {|a| a[1] } - a = params[:direction].eql?('asc') ? (sorted_names + a) : (a + sorted_names) - web_links = a.flatten - end - # if @filter - # @filter.each do |key, value| - # case key - # when 'status' - # a = Array.new - # web_links.each do |web_link| - # value.each do |v| - # case v - # when 'pending' - # a << web_link if web_link.is_checked.nil? - # when 'rejected' - # a << web_link if web_link.is_checked.eql?(false) - # else - # a << web_link if web_link[v] - # end - # end - # end - # web_links = a.uniq - # when 'categories' - # a = Array.new - # web_links.each do |web_link| - # a << web_link if value.include?(web_link.web_link_category.id.to_s) - # end - # web_links = a.uniq - # when 'tags' - # a = Array.new - # web_links.each do |web_link| - # web_link.tags.each do |tag| - # a << web_link if value.include?(tag.id.to_s) - # end - # end - # web_links = a.uniq - # end if value.size > 0 - # end - # end - Kaminari.paginate_array(web_links).page(params[:page]).per(10) - end end diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb index a254c9710..9b0698a8e 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb @@ -12,7 +12,7 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController date_now = Time.now - @web_links = WebLink.where( :is_hidden => false ).desc(:is_top, :name).page(params[:page]).per(10) + @web_links = WebLink.where( :is_hidden => false ).desc(:is_top, :title).page(params[:page]).per(10) get_categorys end diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb index fcb0cb1b3..a9fe23d8c 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb @@ -28,7 +28,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController # deadline - # @web_link = WebLink.where( :is_hidden => false ).desc(:is_top, :name).first + # @web_link = WebLink.where( :is_hidden => false ).desc(:is_top, :title).first @web_links = WebLink.widget_datas.page(params[:page]).per(5) diff --git a/vendor/built_in_modules/web_resource/app/models/web_link.rb b/vendor/built_in_modules/web_resource/app/models/web_link.rb index 4143c38bf..be1f9682d 100644 --- a/vendor/built_in_modules/web_resource/app/models/web_link.rb +++ b/vendor/built_in_modules/web_resource/app/models/web_link.rb @@ -6,8 +6,8 @@ class WebLink include Mongoid::MultiParameterAttributes - has_one :name, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :context, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + field :title, localize: true + field :context, localize: true has_and_belongs_to_many :tags, :class_name => "WebResourceTag" @@ -21,19 +21,17 @@ class WebLink belongs_to :web_link_category - validates_presence_of :name - - before_save :set_key + validates_presence_of :title def self.search( category_id = nil ) if category_id.to_s.size > 0 - find(:all, :conditions => {web_link_category_id: category_id}).desc( :is_top, :name ) + find(:all, :conditions => {web_link_category_id: category_id}).desc( :is_top, :title ) else - find(:all).desc( :is_top, :name) + find(:all).desc( :is_top, :title) end @@ -42,39 +40,16 @@ class WebLink def self.widget_datas - where( :is_hidden => false ).desc(:is_top, :name) + where( :is_hidden => false ).desc(:is_top, :title) end def is_top? self.is_top - end - - def name - @name ||= I18nVariable.first(:conditions => {:key => 'name', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def context - @context ||= I18nVariable.first(:conditions => {:key => 'context', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def text - @text ||= I18nVariable.first(:conditions => {:key => 'text', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end + end def sorted_tags tags.order_by(I18n.locale, :asc) end - protected - - def set_key - if name && name.new_record? - name.key = 'name' - end - if context && context.new_record? - context.key = 'context' - end - end - end \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/models/web_link_category.rb b/vendor/built_in_modules/web_resource/app/models/web_link_category.rb index 53a10a1a2..57f01981f 100644 --- a/vendor/built_in_modules/web_resource/app/models/web_link_category.rb +++ b/vendor/built_in_modules/web_resource/app/models/web_link_category.rb @@ -12,12 +12,12 @@ class WebLinkCategory field :key - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + field :title, localize: true has_many :web_links def pp_object - i18n_variable[I18n.locale] + title end end \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb b/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb index bb97b3517..9a7f35624 100644 --- a/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb +++ b/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb @@ -3,7 +3,7 @@ class WebResourceTag < Tag has_and_belongs_to_many :web_links - def get_visible_links(sort = :name) + def get_visible_links(sort = :title) self.web_links.where(:is_hidden => false).desc(:is_top, sort) end diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb index 2e0f61ff3..4b19235d6 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb @@ -10,12 +10,12 @@
    - <%= f.fields_for :i18n_variable, (@web_link_category.new_record? ? @web_link_category.build_i18n_variable : @web_link_category.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
    <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
    - <%= f.text_field locale, :class => 'input-xxlarge' %> + <%= f.text_field locale, :class => 'input-xxlarge', :value => (@web_link_category.title_translations[locale] rescue nil) %>
    <% end %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb index 8d018df44..4d1198c39 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_web_link_category.html.erb @@ -14,6 +14,6 @@ <% end -%> <% @site_valid_locales.each do |locale| %> - <%= web_link_category.i18n_variable[locale] rescue nil %> + <%= web_link_category.title_translations[locale] rescue nil %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index 60574b947..1274b8844 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -69,17 +69,17 @@
    ">
    <%= f.label :name ,t("web_resource.name")%> - <%= f.fields_for :name, (@web_link.new_record? ? @web_link.build_name : @web_link.name ) do |f| %> + <%= f.fields_for :title_translations do |f| %> <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title' %> + <%= f.text_field locale, :class=>'post-title', :value => (@web_link.title_translations[locale] rescue nil) %> <% end %>
    <%= f.label :describe,t("web_resource.describe") %> - <%= f.fields_for :context, (@web_link.new_record? ? @web_link.build_context : @web_link.context ) do |f| %> + <%= f.fields_for :context_translations do |f| %> <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :style=>"width:100%" %> + <%= f.text_area locale, :style=>"width:100%", :value => (@web_link.context_translations[locale] rescue nil) %> <% end %>
    diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb index 8873ed20c..a53e38bd8 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_sort_headers.html.erb @@ -1,4 +1,4 @@ <%= render_sort_bar(true, ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1', 'bulletin.status'], ['category', 'bulletin_category', 'span2', 'bulletin.category'], - ['name', 'name','span3', 'bulletin.title'], + ['title', 'title','span3', 'bulletin.title'], ['tags', 'tags', 'span2', 'bulletin.tags']).html_safe %> \ No newline at end of file diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb index 85a6ad934..d34dc2b34 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb @@ -19,9 +19,9 @@
    - <%= web_link.web_link_category.i18n_variable[I18n.locale] rescue nil %> + <%= web_link.web_link_category.title rescue nil %> - <%= link_to web_link.name[I18n.locale], panel_web_resource_back_end_web_link_path(web_link) %> + <%= link_to web_link.title, panel_web_resource_back_end_web_link_path(web_link) %>
      <%if at_least_module_manager || web_link.web_link_category.cur_user_is_sub_manager_of(:edit)%> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb index 1eba06465..e69de29bb 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb @@ -1,57 +0,0 @@ -<% # encoding: utf-8 %> - -
      -
      -
      - -

      <%= flash_messages %>

      - -
        -
      • - <%= t('announcement.category') %> - <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %> -
        • -
      • - <%= t('announcement.postdate') %> - <%= display_date(@bulletin.postdate) %> -
        • -
      • - <%= t('announcement.title') %> - <%= @bulletin.title %> -
        • -
      • - <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %> - <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %> -
        • -
      • - <%= t('announcement.subtitle') %> - <%= @bulletin.subtitle %> -
        • -
      • - <%= t('announcement.text') %> - <%= @bulletin.text %> -
        • -
      • -
      • - <%= t('announcement.link') %> - <% @bulletin.bulletin_links.each do | blink | %> - <%= link_to blink.name, blink.url, :target => '_blank' %> - <% end %> -
        • -
      • - <%= t('announcement.file') %> - <% @bulletin.bulletin_files.each do | bfile | %> - <%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %> - <% end %> -
        • -
      • - <%= t('announcement.張貼者') %> - <%= User.find(@bulletin.create_user_id).name %> -
        • -
      • - <%= t('announcement.最後修改時間') %> - <%= display_date(@bulletin.updated_at) %> -
        • - - -<%= link_back %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb index 0d1626a5d..5bb346b14 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb @@ -15,10 +15,10 @@ <% @web_links.each do |post| %> - <%= post.web_link_category.i18n_variable[I18n.locale] rescue nil %> + <%= post.web_link_category.title rescue nil %> - <%#= link_to post.name[I18n.locale], panel_web_resource_front_end_web_link_path(post) %> - <%= link_to post.name[I18n.locale], post.url, {:target => '_blank', :title => post.name[I18n.locale]} %> + <%#= link_to post.title, panel_web_resource_front_end_web_link_path(post) %> + <%= link_to post.title, post.url, {:target => '_blank', :title => post.title} %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb index 7e7f2c95e..e69de29bb 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb @@ -1,57 +0,0 @@ -<% # encoding: utf-8 %> - -
        -
        -
        - -

        <%= flash_messages %>

        - -
          -
        • - <%= t('announcement.category') %> - <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %> -
          • -
        • - <%= t('announcement.postdate') %> - <%= display_date(@bulletin.postdate) %> -
          • -
        • - <%= t('announcement.title') %> - <%= @bulletin.title %> -
          • -
        • - <%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %> - <%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %> -
          • -
        • - <%= t('announcement.subtitle') %> - <%= @bulletin.subtitle %> -
          • -
        • - <%= t('announcement.text') %> - <%= @bulletin.text %> -
          • -
        • -
        • - <%= t('announcement.link') %> - <% @bulletin.bulletin_links.each do | blink | %> - <%= link_to blink.name, blink.url, :target => '_blank' %> - <% end %> -
          • -
        • - <%= t('announcement.file') %> - <% @bulletin.bulletin_files.each do | bfile | %> - <%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %> - <% end %> -
          • -
        • - <%= t('announcement.張貼者') %> - <%= User.find(@bulletin.create_user_id).name %> -
          • -
        • - <%= t('announcement.最後修改時間') %> - <%= display_date_time(@bulletin.updated_at) %> -
          • - - -<%#= link_back %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_web_links.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_web_links.html.erb index 93e65230c..cc612c5ec 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_web_links.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_web_links.html.erb @@ -1,6 +1,6 @@
            <% @web_links.each do |widget| -%> -
          • <%= link_to widget.name[I18n.locale], widget.url, {:target => '_blank', :title => widget.name[I18n.locale]} %>
            • +
          • <%= link_to widget.title, widget.url, {:target => '_blank', :title => widget.title} %>
            • <% end -%>
          diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb index 40d70aaa7..1c7734290 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb @@ -1,5 +1,5 @@ <% if @current_category %> -

          <%= @current_category.i18n_variable[I18n.locale] + " " + t('web_resource.list_lower') %>

          +

          <%= @current_category.title + " " + t('web_resource.list_lower') %>

          <% elsif @tag %>

          <%= @tag[I18n.locale] + " " + t('web_resource.list_lower') %>

          <% else %> @@ -14,9 +14,9 @@ <% @web_links.each do |post| %> - <%= post.web_link_category.i18n_variable[I18n.locale] rescue nil %> + <%= post.web_link_category.title rescue nil %> - <%= link_to post.name[I18n.locale], post.url, {:target => '_blank', :title => post.name[I18n.locale]} %> + <%= link_to post.title, post.url, {:target => '_blank', :title => post.title} %> <% end %> From 94337a58d5608281d3dde2580f37d71ea77c5ed3 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Jul 2012 04:37:40 +0800 Subject: [PATCH 07/15] Task part for i18n_variable removal for web_resource --- lib/tasks/migrate.rake | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index b9cbb6053..b67815005 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -173,6 +173,20 @@ namespace :migrate do end p 'End WebLink' + p '=====================================================' + + p 'Start WebLinkCategory' + categories = WebLinkCategory.admin_manager_all + i = 1 + categories.each do |category| + p "#{i}/#{categories.size} - #{category.id}" + title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + category.save(:validate => false) + i += 1 + end + p 'End WebLinkCategory' + end end From acb7fe0dea53708e693d3f03d23a4f6b345d0513 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Thu, 26 Jul 2012 05:07:32 +0800 Subject: [PATCH 08/15] Remove i18n_variable for controllers, helpers and models --- app/controllers/admin/assets_controller.rb | 2 +- app/helpers/admin/asset_helper.rb | 2 +- app/helpers/admin/item_helper.rb | 2 +- app/helpers/application_helper.rb | 6 +- app/models/ad_image.rb | 4 +- app/models/asset.rb | 27 +--- app/models/asset_category.rb | 3 +- app/models/item.rb | 2 +- app/models/meta/meta.rb | 5 +- app/models/page.rb | 12 +- app/models/page_part.rb | 23 +-- app/models/site.rb | 29 +--- app/models/user/attribute.rb | 2 +- app/models/user/attribute_field.rb | 2 +- app/models/user/role.rb | 2 +- lib/tasks/migrate.rake | 176 ++++++++++++++++++++- 16 files changed, 196 insertions(+), 103 deletions(-) diff --git a/app/controllers/admin/assets_controller.rb b/app/controllers/admin/assets_controller.rb index 58f4a746d..4489ce81f 100644 --- a/app/controllers/admin/assets_controller.rb +++ b/app/controllers/admin/assets_controller.rb @@ -30,7 +30,7 @@ class Admin::AssetsController < OrbitBackendController def create @asset = Asset.new(params[:asset]) - @asset.filename = @asset.title[I18n.locale] rescue nil + @asset.filename = @asset.title rescue nil if @asset.filename && @asset.save respond_to do |format| format.js { diff --git a/app/helpers/admin/asset_helper.rb b/app/helpers/admin/asset_helper.rb index 818a23401..7ed6fa158 100644 --- a/app/helpers/admin/asset_helper.rb +++ b/app/helpers/admin/asset_helper.rb @@ -3,7 +3,7 @@ module Admin::AssetHelper def show_all_fields(asset, field) a = [] @site_valid_locales.each do |locale| - a << asset.send(field)[locale] rescue nil + a << asset.send("#{field}_translations")[locale] rescue nil end a.join(' - ') end diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb index 78e911b92..e30e44ca5 100644 --- a/app/helpers/admin/item_helper.rb +++ b/app/helpers/admin/item_helper.rb @@ -13,7 +13,7 @@ module Admin::ItemHelper ret << "
        • " # ret << "" ret << "
          " - ret << (link_to node.i18n_variable[I18n.locale], dest, :class => 'js_history') + ret << (link_to node.title, dest, :class => 'js_history') ret << "
          " ret << (link_to t('admin.edit'), eval("edit_admin_#{node._type.downcase}_path(node)"), :class => 'js_history') if node._type.eql?('Page') ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node._type.eql?('Page') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0ed5a1bd6..0c6229b3c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -122,11 +122,11 @@ module ApplicationHelper def page_title(page) res = "" - page_title = page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale] + page_title = page.page_title ? page.page_title : page.title if page.root? && @site.title - res << @site.title[I18n.locale] + res << @site.title elsif @site.title && @site.title_always_on - res << @site.title[I18n.locale] + ' - ' + page_title + res << @site.title + ' - ' + page_title else res << page_title end diff --git a/app/models/ad_image.rb b/app/models/ad_image.rb index 9d7fe55b7..869cf031f 100644 --- a/app/models/ad_image.rb +++ b/app/models/ad_image.rb @@ -4,8 +4,8 @@ class AdImage mount_uploader :file, ImageUploader - has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :context, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + field :title, localize: true + field :context, localize: true field :direct_to_after_click,type: Boolean diff --git a/app/models/asset.rb b/app/models/asset.rb index e20fcb9e7..617f04967 100644 --- a/app/models/asset.rb +++ b/app/models/asset.rb @@ -6,10 +6,8 @@ class Asset mount_uploader :data, FileAssetUploader field :filename - field :description - - has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :description, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy + field :description, localize: true + field :title, localize: true validates_presence_of :title, :data, :description @@ -17,29 +15,8 @@ class Asset belongs_to :assetable, polymorphic: true has_and_belongs_to_many :tags, :class_name => "AssetTag" - before_save :set_key - - def title - @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def description - @description ||= I18nVariable.first(:conditions => {:key => 'description', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - def sorted_tags tags.order_by(I18n.locale, :asc) end - - protected - - def set_key - if title && title.new_record? - title.key = 'title' - end - if description && description.new_record? - description.key = 'description' - end - end end diff --git a/app/models/asset_category.rb b/app/models/asset_category.rb index 89bceaf7b..f12575ce7 100644 --- a/app/models/asset_category.rb +++ b/app/models/asset_category.rb @@ -4,8 +4,7 @@ class AssetCategory field :key field :display - - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy + field :title, localize: true has_many :assets diff --git a/app/models/item.rb b/app/models/item.rb index 8dd5c0b45..60f737fec 100644 --- a/app/models/item.rb +++ b/app/models/item.rb @@ -10,8 +10,8 @@ class Item field :is_published, :type => Boolean, :default => false field :enabled_for, :type => Array, :default => nil field :menu_enabled_for, :type => Array, :default => nil + field :title, localize: true - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/ validates :name, :exclusion => { :in => LIST[:forbidden_item_names] } diff --git a/app/models/meta/meta.rb b/app/models/meta/meta.rb index cd713d83f..7a34212ec 100644 --- a/app/models/meta/meta.rb +++ b/app/models/meta/meta.rb @@ -4,16 +4,15 @@ class Meta include Mongoid::Timestamps field :key + field :title, localize: true field :value, :default => nil - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy - def get_name_content [self.key, get_content] end def get_content - self.value ? self.value : self.i18n_variable[I18n.locale] + self.value ? self.value : self.title end end diff --git a/app/models/page.rb b/app/models/page.rb index 970df4cfe..cb86c842f 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -9,10 +9,10 @@ class Page < Item field :category field :tag field :view_count, :type => Integer, :default => 0 + field :page_title, localize: true belongs_to :design belongs_to :module_app - has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy has_many :page_parts, :autosave => true, :dependent => :destroy has_many :page_contexts, :autosave => true, :dependent => :destroy has_many :page_metas, :autosave => true, :dependent => :destroy @@ -21,10 +21,6 @@ class Page < Item before_save :create_parts, :set_key # embeds_many :custom_images, :class_name => 'Image', as: :design_image - - def title - @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end protected @@ -47,10 +43,4 @@ class Page < Item end end - def set_key - if title && title.new_record? - title.key = 'title' - end - end - end diff --git a/app/models/page_part.rb b/app/models/page_part.rb index 52eafdf31..5f4b1dd61 100644 --- a/app/models/page_part.rb +++ b/app/models/page_part.rb @@ -4,34 +4,15 @@ class PagePart include Mongoid::Timestamps field :name - field :content + field :content, localize: true field :kind field :public_r_tag field :public_r_tag_object_id, :default => nil field :public_r_tag_option, :default => nil + field :page_title, localize: true field :widget_path - - has_one :i18n_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy belongs_to :page belongs_to :module_app - before_save :set_key - - def i18n_variable - @i18n_variable ||= I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def title - @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - protected - - def set_key - title.key = 'title' if title && (title.key.blank? rescue true) - i18n_variable.key = 'i18n_variable' if i18n_variable && (i18n_variable.key.blank? rescue true) - end - end \ No newline at end of file diff --git a/app/models/site.rb b/app/models/site.rb index 55d6bfaf7..faa7ece37 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -18,12 +18,11 @@ class Site field :school field :department - has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :footer, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_one :sub_menu, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy - has_many :site_metas, :autosave => true, :dependent => :destroy + field :title, localize: true + field :footer, localize: true + field :sub_menu, localize: true - before_save :set_key + has_many :site_metas, :autosave => true, :dependent => :destroy def generate_keys private_key = OpenSSL::PKey::RSA.generate(2048) @@ -40,18 +39,6 @@ class Site res.eql?('local out of date') ? false : true end - def title - @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def footer - @footer ||= I18nVariable.first(:conditions => {:key => 'footer', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - - def sub_menu - @sub_menu ||= I18nVariable.first(:conditions => {:key => 'sub_menu', :language_value_id => self.id, :language_value_type => self.class}) rescue nil - end - METAS.each do |meta| define_method meta do fetch_meta = self.site_metas.where(key: meta).limit(1) @@ -66,13 +53,5 @@ class Site end end end - - protected - - def set_key - title.key = 'title' if title && (title.key.blank? rescue true) - footer.key = 'footer' if footer && (footer.key.blank? rescue true) - sub_menu.key = 'sub_menu' if sub_menu && (sub_menu.key.blank? rescue true) - end end diff --git a/app/models/user/attribute.rb b/app/models/user/attribute.rb index af8a11064..faa5876a0 100644 --- a/app/models/user/attribute.rb +++ b/app/models/user/attribute.rb @@ -6,9 +6,9 @@ class Attribute field :key field :built_in, :type => Boolean, :default => false field :disabled, :type => Boolean, :default => false + field :title, localize: true has_many :attribute_fields, :autosave => true, :dependent => :destroy - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :attribute_fields, :allow_destroy => true def is_built_in? diff --git a/app/models/user/attribute_field.rb b/app/models/user/attribute_field.rb index 42bbf9109..2a227d27d 100644 --- a/app/models/user/attribute_field.rb +++ b/app/models/user/attribute_field.rb @@ -9,9 +9,9 @@ class AttributeField field :list_options, :type => Array field :built_in, :type => Boolean, :default => false field :disabled, :type => Boolean, :default => false + field :title, localize: true belongs_to :attribute - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy has_many :attribute_values # validates_uniqueness_of :key diff --git a/app/models/user/role.rb b/app/models/user/role.rb index 86f7266fc..64db9ac24 100644 --- a/app/models/user/role.rb +++ b/app/models/user/role.rb @@ -6,9 +6,9 @@ class Role field :key field :built_in, :type => Boolean, :default => false field :disabled, :type => Boolean, :default => false + field :title, localize: true has_many :sub_roles, :autosave => true, :dependent => :destroy - has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy has_many :users accepts_nested_attributes_for :i18n_variable, :allow_destroy => true accepts_nested_attributes_for :sub_roles, :allow_destroy => true diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index b67815005..a13e0ff3e 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -145,7 +145,7 @@ namespace :migrate do p '=====================================================' p 'Start PageContext' - page_contexts = PageContext.admin_manager_all + page_contexts = PageContext.all i = 1 page_contexts.each do |page_context| p "#{i}/#{page_contexts.size} - #{page_context.id}" @@ -160,12 +160,13 @@ namespace :migrate do p '=====================================================' p 'Start WebLink' - links = WebLink.admin_manager_all + links = WebLink.all i = 1 links.each do |link| p "#{i}/#{links.size} - #{link.id}" - name = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class}) - link.name_translations = {'en' => name['en'], 'zh_tw' => name['zh_tw']} if name + # the original key was 'name' + title = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class}) + link.name_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title context = I18nVariable.first(:conditions => {:key => 'context', :language_value_id => link.id, :language_value_type => link.class}) link.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context link.save(:validate => false) @@ -187,6 +188,173 @@ namespace :migrate do end p 'End WebLinkCategory' + p '=====================================================' + p '=====================================================' + + p 'Start Meta' + metas = Meta.all + i = 1 + metas.each do |meta| + p "#{i}/#{metas.size} - #{meta.id}" + title = I18nVariable.first(:conditions => {:language_value_id => meta.id, :language_value_type => meta.class}) + meta.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + meta.save(:validate => false) + i += 1 + end + p 'End Meta' + + p '=====================================================' + p '=====================================================' + + p 'Start Attribute' + attributes = Attribute.all + i = 1 + attributes.each do |attribute| + p "#{i}/#{attributes.size} - #{attribute.id}" + title = I18nVariable.first(:conditions => {:language_value_id => attribute.id, :language_value_type => attribute.class}) + attribute.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + attribute.save(:validate => false) + i += 1 + end + p 'End Attribute' + + p '=====================================================' + + p 'Start AttributeField' + attribute_fields = AttributeField.all + i = 1 + attribute_fields.each do |attribute_field| + p "#{i}/#{attribute_fields.size} - #{attribute_field.id}" + title = I18nVariable.first(:conditions => {:language_value_id => attribute_field.id, :language_value_type => attribute_field.class}) + attribute_field.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + attribute_field.save(:validate => false) + i += 1 + end + p 'End AttributeField' + + p '=====================================================' + + p 'Start Role' + roles = Role.all + i = 1 + roles.each do |role| + p "#{i}/#{roles.size} - #{role.id}" + title = I18nVariable.first(:conditions => {:language_value_id => role.id, :language_value_type => role.class}) + role.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + role.save(:validate => false) + i += 1 + end + p 'End Role' + + p '=====================================================' + p '=====================================================' + + p 'Start AdImage' + ad_images = AdImage.all + i = 1 + ad_images.each do |image| + p "#{i}/#{ad_images.size} - #{image.id}" + # no key is set and title = context, this is due to original error in the code + title = I18nVariable.first(:conditions => {:language_value_id => image.id, :language_value_type => image.class}) + image.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + image.context_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + image.save(:validate => false) + i += 1 + end + p 'End AdImage' + + p '=====================================================' + p '=====================================================' + + p 'Start Asset' + assets = Asset.all + i = 1 + assets.each do |asset| + p "#{i}/#{assets.size} - #{asset.id}" + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => asset.id, :language_value_type => asset.class}) + asset.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + description = I18nVariable.first(:conditions => {:key => 'description', :language_value_id => asset.id, :language_value_type => asset.class}) + asset.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + asset.save(:validate => false) + i += 1 + end + p 'End Asset' + + p '=====================================================' + + p 'Start AssetCategory' + categories = AssetCategory.all + i = 1 + categories.each do |category| + p "#{i}/#{categories.size} - #{category.id}" + title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + category.save(:validate => false) + i += 1 + end + p 'End AssetCategory' + + p '=====================================================' + p '=====================================================' + + p 'Start Item' + items = Item.all + i = 1 + items.each do |item| + p "#{i}/#{items.size} - #{item.id}" + title = I18nVariable.first(:conditions => {:language_value_id => item.id, :language_value_type => item.class}) + item.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + item.save(:validate => false) + i += 1 + end + p 'End Item' + + p '=====================================================' + + p 'Start Page' + pages = Page.all + i = 1 + pages.each do |item| + p "#{i}/#{pages.size} - #{item.id}" + # the key was originally 'title', changed to 'page_title' to avoit conflict with parent + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => item.id, :language_value_type => item.class}) + item.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + item.save(:validate => false) + i += 1 + end + p 'End Page' + + p '=====================================================' + + p 'Start PagePart' + page_parts = PagePart.all + i = 1 + page_parts.each do |part| + p "#{i}/#{page_parts.size} - #{part.id}" + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class}) + part.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + content = I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => part.id, :language_value_type => part.class}) + part.content_translations = {'en' => content['en'], 'zh_tw' => content['zh_tw']} if content + part.save(:validate => false) + i += 1 + end + p 'End PagePart' + + p '=====================================================' + p '=====================================================' + + p 'Start Site' + site = Site.first + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class}) + site.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + footer = I18nVariable.first(:conditions => {:key => 'footer', :language_value_id => site.id, :language_value_type => site.class}) + site.footer_translations = {'en' => footer['en'], 'zh_tw' => footer['zh_tw']} if footer + sub_menu = I18nVariable.first(:conditions => {:key => 'sub_menu', :language_value_id => site.id, :language_value_type => site.class}) + site.sub_menu_translations = {'en' => sub_menu['en'], 'zh_tw' => sub_menu['zh_tw']} if sub_menu + site.save(:validate => false) + end + p 'End Site' + end end From 5713df685d6477429c2b90896a47e7a1707e2627 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou <chris.vilayphiou@gmail.com> Date: Thu, 26 Jul 2012 05:58:09 +0800 Subject: [PATCH 09/15] Remove i18n_variable for views --- app/models/user/user.rb | 2 +- .../admin/ad_banners/_modal_preview.html.erb | 2 +- .../admin/ad_banners/_preview_block.html.erb | 2 +- app/views/admin/ad_images/_form.html.erb | 8 ++++---- .../asset_categories/_asset_category.html.erb | 2 +- app/views/admin/asset_categories/_form.html.erb | 4 ++-- app/views/admin/assets/_asset.html.erb | 4 ++-- app/views/admin/assets/_form.html.erb | 6 +++--- app/views/admin/assets/file_upload.html.erb | 8 ++++---- .../admin/attributes/_attribute_field.html.erb | 4 ++-- app/views/admin/attributes/index.html.erb | 2 +- app/views/admin/dashboards/index.html.erb | 4 ++-- app/views/admin/infos/_form.html.erb | 4 ++-- app/views/admin/links/_form.html.erb | 4 ++-- app/views/admin/links/_show.html.erb | 2 +- .../module_apps/reload_frontend_pages.js.erb | 2 +- .../admin/page_parts/_module_widget.html.erb | 4 ++-- app/views/admin/page_parts/_text.html.erb | 4 ++-- .../page_parts/_widget_categories.html.erb | 2 +- .../admin/page_parts/_widget_tags.html.erb | 2 +- app/views/admin/pages/_form.html.erb | 6 +++--- app/views/admin/roles/_form.html.erb | 4 ++-- app/views/admin/roles/_sub_role.html.erb | 4 ++-- app/views/admin/sites/site_info.html.erb | 17 +++++++++-------- app/views/admin/users/_form.html.erb | 4 ++-- app/views/admin/users/_info.html.erb | 4 ++-- app/views/admin/users/_show_attribute.html.erb | 2 +- app/views/admin/users/_show_sub_role.html.erb | 2 +- app/views/admin/users/_sub_role.html.erb | 4 ++-- .../admin/users/_sub_role_selector.html.erb | 2 +- app/views/admin/users/index.html.erb | 2 +- app/views/admin/users/show.html.erb | 4 ++-- 32 files changed, 64 insertions(+), 63 deletions(-) diff --git a/app/models/user/user.rb b/app/models/user/user.rb index 46dc10400..1f7b11d77 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -35,7 +35,7 @@ class User # if(self.cache_dept.nil?) # self.build_cache_dept key: "dept_cache_user_#{self.id}" # end - dept_hash[locale] = sub_roles.collect{|sr| sr.i18n_variable[locale]}.join(',') + dept_hash[locale] = sub_roles.collect{|sr| sr.title}.join(',') # self.cache_dept[locale] = sub_roles.collect{|sr| sr.i18n_variable[locale]}.join(',') end self.cache_dept = dept_hash diff --git a/app/views/admin/ad_banners/_modal_preview.html.erb b/app/views/admin/ad_banners/_modal_preview.html.erb index ffc841074..3dc985216 100644 --- a/app/views/admin/ad_banners/_modal_preview.html.erb +++ b/app/views/admin/ad_banners/_modal_preview.html.erb @@ -8,7 +8,7 @@ <div class="modal-body"> <p class="ad_banner_slideshow"> <% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%> - <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %> + <%= image_tag ad_image.file,:alt => (ad_image.title || " "),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %> <% end -%> </p> </div> diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb index 47646f6f1..afa9125de 100644 --- a/app/views/admin/ad_banners/_preview_block.html.erb +++ b/app/views/admin/ad_banners/_preview_block.html.erb @@ -9,7 +9,7 @@ <div class="modal-body"> <p class="ad_banner_slideshow"> <% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%> - <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %> + <%= image_tag ad_image.file,:alt => (ad_image.title || ' '),:time_to_next => ad_banner.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %> <% end -%> </p> </div> diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index edbb2563d..3ecda29b7 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -142,14 +142,14 @@ <% @site_valid_locales.each do |locale|%> <%= content_tag :div,:class => "tab-pane #{active_when_current_locale_eq locale}",:id=>"#{locale}" do%> <div class="title"> - <%= f.fields_for :title,@ad_image.title do |f| %> - <%= f.text_field locale,:class=>"ad_image-title post-title",:placeholder => "輸入標題"%> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class=>"ad_image-title post-title", :placeholder => "輸入標題", :value => (@ad_image.title_translations[locale] rescue nil) %> <% end %> </div> <br/> <div class="context editor"> - <%= f.fields_for :context, @ad_image.context do |f| %> - <%= f.text_area locale,:style => "width:100%", :class => "tinymce_textarea post-title" %> + <%= f.fields_for :context_translations, @ad_image.context do |f| %> + <%= f.text_area locale, :style => "width:100%", :class => "tinymce_textarea post-title", :value => (@ad_image.context_translations[locale] rescue nil) %> <% end %> </div> diff --git a/app/views/admin/asset_categories/_asset_category.html.erb b/app/views/admin/asset_categories/_asset_category.html.erb index d7047e36f..64a931da5 100644 --- a/app/views/admin/asset_categories/_asset_category.html.erb +++ b/app/views/admin/asset_categories/_asset_category.html.erb @@ -12,6 +12,6 @@ </div> </td> <% @site_valid_locales.each do |locale| %> - <td><%= asset_category.i18n_variable[locale] rescue nil %></td> + <td><%= asset_category.title_translations[locale] rescue nil %></td> <% end %> </tr> diff --git a/app/views/admin/asset_categories/_form.html.erb b/app/views/admin/asset_categories/_form.html.erb index 5c64146f0..76df5c003 100644 --- a/app/views/admin/asset_categories/_form.html.erb +++ b/app/views/admin/asset_categories/_form.html.erb @@ -10,12 +10,12 @@ </div> <div id="widget-title"> - <%= f.fields_for :i18n_variable, (@asset_category.new_record? ? @asset_category.build_i18n_variable : @asset_category.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> <div class="control-group"> <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> <div class="controls"> - <%= f.text_field locale, :class => 'input-xxlarge' %> + <%= f.text_field locale, :class => 'input-xxlarge', :value => (@asset_category.title_translations[locale] rescue nil) %> </div> </div> <% end %> diff --git a/app/views/admin/assets/_asset.html.erb b/app/views/admin/assets/_asset.html.erb index 3a8dc4396..a45e9a4b4 100644 --- a/app/views/admin/assets/_asset.html.erb +++ b/app/views/admin/assets/_asset.html.erb @@ -1,6 +1,6 @@ <tr id="asset_<%= asset.id %>" class="with_action"> <td><%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %></td> - <td><%= asset.title.i18n_variable[I18n.locale] rescue nil %></td> + <td><%= asset.title rescue nil %></td> <td> <i class="icons-picture img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i> <div class="quick-edit"> @@ -12,7 +12,7 @@ </td> <td><%= asset.data.file.content_type %></td> <td><%= number_to_human_size(asset.data.file.file_length) %></td> - <td><%= asset.description.i18n_variable[I18n.locale] rescue nil %></td> + <td><%= asset.description rescue nil %></td> <td> <div class="label-group"> <div class="label-td"> diff --git a/app/views/admin/assets/_form.html.erb b/app/views/admin/assets/_form.html.erb index 4e1589f47..dddfa9e65 100644 --- a/app/views/admin/assets/_form.html.erb +++ b/app/views/admin/assets/_form.html.erb @@ -1,12 +1,12 @@ <div class="control-group"> <label for="title" class="control-label"><%= t 'admin.title' %></label> <div class="controls"> - <%= f.fields_for :i18n_variable, (@asset.new_record? ? @asset.build_i18n_variable : @asset.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> <%= content_tag :label do -%> <div> <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class => "input-large" %> + <%= f.text_field locale, :class => "input-large", :value => (@asset.title_translations[locale] rescue nil) %> </div> <% end %> <% end %> @@ -16,7 +16,7 @@ <div class="control-group"> <label class="control-label"><%= f.label :category, t('admin.category') %></label> <div class="controls"> - <%= f.select :asset_category_id, @asset_categories.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-large" %> + <%= f.select :asset_category_id, @asset_categories.collect{|t| [ t.title, t.id ]}, {}, :class => "input-large" %> </div> </div> <div class="control-group"> diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb index ff21935c7..abdcfbc6c 100644 --- a/app/views/admin/assets/file_upload.html.erb +++ b/app/views/admin/assets/file_upload.html.erb @@ -11,13 +11,13 @@ <div class="control-group"> <label for="title" class="control-label error"><%= t 'admin.title' %></label> <div class="controls"> - <%= f.fields_for :title, (@asset.new_record? ? @asset.build_title : @asset.title) do |f| %> + <%= f.fields_for :title_translations do |f| %> <div> <% @site_valid_locales.each do |locale| %> <%= content_tag :label do -%> <div> <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class => "input-large" %> + <%= f.text_field locale, :class => "input-large", :value => (@asset.title_translations[locale] rescue nil) %> </div> <% end %> <% end %> @@ -28,13 +28,13 @@ <div class="control-group"> <label for="description" class="control-label error"><%= t 'admin.description' %></label> <div class="controls"> - <%= f.fields_for :description, (@asset.new_record? ? @asset.build_description : @asset.description) do |f| %> + <%= f.fields_for :description_translations do |f| %> <div> <% @site_valid_locales.each do |locale| %> <%= content_tag :label do -%> <div> <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class => "input-large" %> + <%= f.text_field locale, :class => "input-large", :value => (@asset.title_translations[locale] rescue nil) %> </div> <% end %> <% end %> diff --git a/app/views/admin/attributes/_attribute_field.html.erb b/app/views/admin/attributes/_attribute_field.html.erb index 63ee5953b..b2e94344c 100644 --- a/app/views/admin/attributes/_attribute_field.html.erb +++ b/app/views/admin/attributes/_attribute_field.html.erb @@ -3,9 +3,9 @@ <td class='select_mulitlingual' style='text-align:center'> <%= f.check_box :locale %> </td> - <%= f.fields_for :i18n_variable, (attribute_field.new_record? ? attribute_field.build_i18n_variable : attribute_field.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> - <td><%= f.text_field locale, :style => "width:130px" %></td> + <td><%= f.text_field locale, :style => "width:130px", :value => (attribute_field.title_translations[locale] rescue nil) %></td> <% end %> <% end %> <td class='select_type'> diff --git a/app/views/admin/attributes/index.html.erb b/app/views/admin/attributes/index.html.erb index 71ec1699d..83ded4ebc 100644 --- a/app/views/admin/attributes/index.html.erb +++ b/app/views/admin/attributes/index.html.erb @@ -16,7 +16,7 @@ <tbody> <% @attributes.each do |attribute| %> <tr id="attribute_<%= attribute.id %>" class="have <%= "#{attribute.is_disabled? ? 'disable' : ''}" %>"> - <td class="<%= @attribute_type %>s <%= attribute.key.downcase %>"><%= attribute.i18n_variable[I18n.locale] %></span> + <td class="<%= @attribute_type %>s <%= attribute.key.downcase %>"><%= attribute.title %></span> <td class="action"> <%= link_to t(:edit), eval("edit_admin_#{@attribute_type}_path(attribute)"), :class => 'edit' %> diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index dbca5aa69..180a04693 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -514,7 +514,7 @@ <tbody> <% @recent_updated.each do |object| %> <tr> - <td><%= link_to ((object[0].title[I18n.locale] rescue nil) || (object[0].page.i18n_variable[I18n.locale] rescue nil)), get_link_to_object(object[0]) %></td> + <td><%= link_to ((object[0].title rescue nil) || (object[0].page.title rescue nil)), get_link_to_object(object[0]) %></td> <td class="span2"><%= link_to t("dashboard.#{object[0]._type.underscore}"), get_link(object[0]._type.underscore) %></td> </tr> <% end %> @@ -552,7 +552,7 @@ <tbody> <% @most_visited.each do |object| %> <tr> - <td><%= link_to ((object[0].title[I18n.locale] rescue nil) || (object[0].page.i18n_variable[I18n.locale] rescue nil)), get_link_to_object(object[0]) %></td> + <td><%= link_to ((object[0].title rescue nil) || (object[0].page.title rescue nil)), get_link_to_object(object[0]) %></td> <td class="span2"><%= link_to t("dashboard.#{object[0]._type.underscore}"), get_link(object[0]._type.underscore) %></td> <td class="span2"><%= object[1] %></td> </tr> diff --git a/app/views/admin/infos/_form.html.erb b/app/views/admin/infos/_form.html.erb index 103c7af1d..a499784a7 100644 --- a/app/views/admin/infos/_form.html.erb +++ b/app/views/admin/infos/_form.html.erb @@ -13,9 +13,9 @@ <tbody> <tr class="list_item"> <td><%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @attribute.key %></td> - <%= f.fields_for :i18n_variable, (@attribute.new_record? ? @attribute.build_i18n_variable : @attribute.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> - <td><%= f.text_field locale, :style => "width:150px" %></td> + <td><%= f.text_field locale, :style => "width:150px", :value => (@attribute.title_translations[locale] rescue nil) %></td> <% end %> <% end %> </tr> diff --git a/app/views/admin/links/_form.html.erb b/app/views/admin/links/_form.html.erb index 2f03b9689..f1415e98b 100644 --- a/app/views/admin/links/_form.html.erb +++ b/app/views/admin/links/_form.html.erb @@ -6,11 +6,11 @@ <%= f.text_field :name, :class => 'text' %> </p> -<%= f.fields_for :i18n_variable, (@item.new_record? ? @item.build_i18n_variable : @item.i18n_variable) do |f| %> +<%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> <p> <%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %> - <%= f.text_field locale %> + <%= f.text_field locale, :value => (@item.title_translations[locale] rescue nil) %> </p> <% end %> <% end %> diff --git a/app/views/admin/links/_show.html.erb b/app/views/admin/links/_show.html.erb index 33ca0c20b..85927a85a 100644 --- a/app/views/admin/links/_show.html.erb +++ b/app/views/admin/links/_show.html.erb @@ -7,7 +7,7 @@ <% @site_valid_locales.each do |locale| %> <p> <b><%= "#{t('admin.title')} #{locale}" %></b> - <%= @item.i18n_variable[locale] if @item.i18n_variable %> + <%= @item.title_translations[locale] if @item.title %> </p> <% end %> diff --git a/app/views/admin/module_apps/reload_frontend_pages.js.erb b/app/views/admin/module_apps/reload_frontend_pages.js.erb index 2fc90b8eb..87d3476e7 100644 --- a/app/views/admin/module_apps/reload_frontend_pages.js.erb +++ b/app/views/admin/module_apps/reload_frontend_pages.js.erb @@ -1,3 +1,3 @@ $('#app_page_url').html("<%= escape_javascript(select 'page', 'app_frontend_url', @module_app.app_pages) %>"); -$('#app_page_category').html("<%= j (select 'page', 'category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, {:include_blank => true}) if @categories %>"); +$('#app_page_category').html("<%= j (select 'page', 'category', @categories.collect{|category| [category.title, category.id]}, {:include_blank => true}) if @categories %>"); $('#app_page_tag').html("<%= j (select 'page', 'tag', @tags.collect{|tag| [tag[I18n.locale], tag.id]}, {:include_blank => true}) if @tags %>"); \ No newline at end of file diff --git a/app/views/admin/page_parts/_module_widget.html.erb b/app/views/admin/page_parts/_module_widget.html.erb index 1a1dd63cc..9cf0be338 100644 --- a/app/views/admin/page_parts/_module_widget.html.erb +++ b/app/views/admin/page_parts/_module_widget.html.erb @@ -1,9 +1,9 @@ <div> - <%= f.fields_for :title, @part.title do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> <p> <%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %> - <%= f.text_field locale %> + <%= f.text_field locale, :value => (@part.title_translations[locale] rescue nil) %> </p> <% end %> <% end %> diff --git a/app/views/admin/page_parts/_text.html.erb b/app/views/admin/page_parts/_text.html.erb index c7386623a..1eb572053 100644 --- a/app/views/admin/page_parts/_text.html.erb +++ b/app/views/admin/page_parts/_text.html.erb @@ -1,8 +1,8 @@ -<%= f.fields_for :i18n_variable, (@part.i18n_variable ? @part.i18n_variable : @part.build_i18n_variable) do |f| %> +<%= f.fields_for :content_translations do |f| %> <% @site_valid_locales.each do |locale| %> <div> <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :class => 'tinymce_textarea' %> + <%= f.text_area locale, :class => 'tinymce_textarea', :value => (@part.content_translations[locale] rescue nil) %> </div> <% end %> <% end %> \ No newline at end of file diff --git a/app/views/admin/page_parts/_widget_categories.html.erb b/app/views/admin/page_parts/_widget_categories.html.erb index 60659036b..7db04e3ed 100644 --- a/app/views/admin/page_parts/_widget_categories.html.erb +++ b/app/views/admin/page_parts/_widget_categories.html.erb @@ -1 +1 @@ - <%= select 'page_part', 'category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => (@part ? @part[:category] : nil), :include_blank => true if @categories && @categories.size > 0 %> \ No newline at end of file + <%= select 'page_part', 'category', @categories.collect{|category| [category.title, category.id]}, :selected => (@part ? @part[:category] : nil), :include_blank => true if @categories && @categories.size > 0 %> \ No newline at end of file diff --git a/app/views/admin/page_parts/_widget_tags.html.erb b/app/views/admin/page_parts/_widget_tags.html.erb index bb78f118d..688ac3cbd 100644 --- a/app/views/admin/page_parts/_widget_tags.html.erb +++ b/app/views/admin/page_parts/_widget_tags.html.erb @@ -1 +1 @@ - <%= select 'page_part', 'tag', @tags.collect{|category| [category[I18n.locale], category.id]}, :selected => (@part ? @part[:tag] : nil), :include_blank => true if @tags && @tags.size > 0 %> \ No newline at end of file + <%= select 'page_part', 'tag', @tags.collect{|tag| [tag[I18n.locale], tag.id]}, :selected => (@part ? @part[:tag] : nil), :include_blank => true if @tags && @tags.size > 0 %> \ No newline at end of file diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb index eff3e4df1..6822697d0 100644 --- a/app/views/admin/pages/_form.html.erb +++ b/app/views/admin/pages/_form.html.erb @@ -9,12 +9,12 @@ </div> </div> -<%= f.fields_for :i18n_variable, (@item.new_record? ? @item.build_i18n_variable : @item.i18n_variable) do |f| %> +<%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> <div class="control-group"> <%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}", :class => 'control-label' %> <div class="controls"> - <%= f.text_field locale, :class => 'text input-xlarge' %> + <%= f.text_field locale, :class => 'text input-xlarge', :value => (@item.title_translations[locale] rescue nil) %> <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> </div> </div> @@ -43,7 +43,7 @@ <%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%> </span> <span id="app_page_category"> - <%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%> + <%= select('page','category', @categories.collect{|category| [category.title, category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%> </span> <span id="app_page_tag"> <%= select('page','tag', @tags.collect{|tag| [tag[I18n.locale], tag.id]}, :selected => @item[:tag], :include_blank => true ) rescue ''%> diff --git a/app/views/admin/roles/_form.html.erb b/app/views/admin/roles/_form.html.erb index b744f20c4..1dd889cc0 100644 --- a/app/views/admin/roles/_form.html.erb +++ b/app/views/admin/roles/_form.html.erb @@ -14,9 +14,9 @@ <tbody> <tr class="list_item"> <td><%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @attribute.key %></td> - <%= f.fields_for :i18n_variable, (@attribute.new_record? ? @attribute.build_i18n_variable : @attribute.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> - <td><%= f.text_field locale, :style => "width:150px" %></td> + <td><%= f.text_field locale, :style => "width:150px", :value => (@attribute.title_translations[locale] rescue nil) %></td> <% end %> <% end %> </tr> diff --git a/app/views/admin/roles/_sub_role.html.erb b/app/views/admin/roles/_sub_role.html.erb index ca20890f7..d4236dfc2 100644 --- a/app/views/admin/roles/_sub_role.html.erb +++ b/app/views/admin/roles/_sub_role.html.erb @@ -11,9 +11,9 @@ <tbody> <tr class="list_item"> <td><%= sub_role.new_record? ? (f.text_field :key, {:style => "width:150px"}) : sub_role.key %></td> - <%= f.fields_for :i18n_variable, (sub_role.new_record? ? sub_role.build_i18n_variable : sub_role.i18n_variable) do |f| %> + <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> - <td><%= f.text_field locale, :style => "width:150px" %></td> + <td><%= f.text_field locale, :style => "width:150px", :value => (sub_role.title_translations[locale] rescue nil) %></td> <% end %> <% end %> </tr> diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index e19307ca6..4ce99df13 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -25,8 +25,8 @@ <div class="control-group"> <label class="control-label"><%= t 'admin.site_title' %></label> <div class="controls"> - <%= f.fields_for :title, @site.title do |f| %> - <%= f.text_field locale, :class => "input-xxlarge" %> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-xxlarge", :value => (@site.title_translations[locale] rescue nil) %> <% end %> <p class="help-block"><%= (t 'admin.site_title_help').html_safe %></p> </div> @@ -38,6 +38,7 @@ <div class="control-group"> <label class="control-label"><%= t 'admin.site_keywords' %></label> <div class="controls"> + <% #TODO: set keywords into meta %> <%= f.fields_for :keywords, @site.keywords do |f| %> <%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %> <% end %> @@ -47,8 +48,8 @@ <div class="control-group"> <label class="control-label"><%= t 'admin.site_description' %></label> <div class="controls"> - <%= f.fields_for :description, @site.description do |f| %> - <%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %> + <%= f.fields_for :description_translations do |f| %> + <%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.description_translations[locale] %> <% end %> <p class="help-block"><%= (t 'admin.site_description_help').html_safe %></p> </div> @@ -56,8 +57,8 @@ <div class="control-group"> <label class="control-label"><%= t 'admin.site_footer' %></label> <div class="controls"> - <%= f.fields_for :footer, @site.footer do |f| %> - <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %> + <%= f.fields_for :footer_translations do |f| %> + <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.footer_translations[locale] %> <% end %> <p class="help-block"><%= (t 'admin.site_footer_help').html_safe %></p> </div> @@ -65,8 +66,8 @@ <div class="control-group"> <label class="control-label"><%= t 'admin.site_sub_menu' %></label> <div class="controls"> - <%= f.fields_for :sub_menu, @site.sub_menu do |f| %> - <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %> + <%= f.fields_for :sub_menu_translations do |f| %> + <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.sub_menu_translations[locale] %> <% end %> </div> </div> diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb index 37ee9d28d..c0cb194e4 100644 --- a/app/views/admin/users/_form.html.erb +++ b/app/views/admin/users/_form.html.erb @@ -16,7 +16,7 @@ </label> <label> <span><%= t('admin.role') %>：</span> - <%= f.select :role_id, @roles.sort_by{|role| role.key }.collect {|role| [ role.i18n_variable[I18n.locale], role.id ]}, :selected => (@user.role_id || Role.get_role_from_key('student')) %> + <%= f.select :role_id, @roles.sort_by{|role| role.key }.collect {|role| [ role.title, role.id ]}, :selected => (@user.role_id || Role.get_role_from_key('student')) %> </label> </div> @@ -27,7 +27,7 @@ <div id='roles'> <% @roles.each do |role| %> <div id="<%= role.id %>_block" class="attributes_block <%= @class %>" <%= raw(' style="display: none;"') unless ((@user.role.id.eql?(role.id) rescue nil) || (role.key.eql?('student') && @user.new_record?)) %>> - <h2><%= role.i18n_variable[I18n.locale] %></h2> + <h2><%= role.title %></h2> <hr class="<#%= @user.role.key %>_block"> <%= render :partial => 'sub_role_selector', :locals => {:f => f, :role => role} %> <%= render :partial => 'sub_role', :collection => role.sub_roles, :locals => {:f => f, :role => role} %> diff --git a/app/views/admin/users/_info.html.erb b/app/views/admin/users/_info.html.erb index a7d44ea9e..53a044d45 100644 --- a/app/views/admin/users/_info.html.erb +++ b/app/views/admin/users/_info.html.erb @@ -1,5 +1,5 @@ <div id="basic_block" class="attributes_block <%= @class %>"> - <h2><%= info.i18n_variable[I18n.locale] %></h2> + <h2><%= info.title %></h2> <hr> <div class="info_input"> <table border="0" cellspacing="0" cellpadding="0"> @@ -15,7 +15,7 @@ <% info.get_enabled_attribute_fields.each do |attr| %> <%= f.fields_for :attribute_values, @user.get_value_from_field_id(attr.id) do |f| %> <tr class="list_item"> - <td><%= attr.i18n_variable[I18n.locale] %></td> + <td><%= attr.title %></td> <% if attr["locale"] && attr["markup"] == 'text_field' %> <% @site_valid_locales.each do |locale| %> <td><%= f.text_field locale %></td> diff --git a/app/views/admin/users/_show_attribute.html.erb b/app/views/admin/users/_show_attribute.html.erb index ec33f84b9..98e8713c3 100644 --- a/app/views/admin/users/_show_attribute.html.erb +++ b/app/views/admin/users/_show_attribute.html.erb @@ -9,7 +9,7 @@ <tbody> <% show_attribute.get_enabled_attribute_fields.each do |attr| %> <tr class="list_item"> - <td><%= attr.i18n_variable[I18n.locale] %></td> + <td><%= attr.title %></td> <% @site_valid_locales.each do |locale| %> <td> <% if attr["locale"] && attr["markup"] == 'text_field' %> diff --git a/app/views/admin/users/_show_sub_role.html.erb b/app/views/admin/users/_show_sub_role.html.erb index 4968b2db6..3f60aa648 100644 --- a/app/views/admin/users/_show_sub_role.html.erb +++ b/app/views/admin/users/_show_sub_role.html.erb @@ -1,4 +1,4 @@ <div id="sub_role_<%= show_sub_role.id %>" class="group"> - <h2><%= show_sub_role.i18n_variable[I18n.locale] %></h2> + <h2><%= show_sub_role.title %></h2> <%= render :partial => 'show_attribute', :object => show_sub_role %> </div> \ No newline at end of file diff --git a/app/views/admin/users/_sub_role.html.erb b/app/views/admin/users/_sub_role.html.erb index 7bc555848..36c8b0b78 100644 --- a/app/views/admin/users/_sub_role.html.erb +++ b/app/views/admin/users/_sub_role.html.erb @@ -1,5 +1,5 @@ <div id="sub_role_<%= sub_role.id %>" class="group" <%= raw(' style="display: none;"') unless @user.sub_role_ids.include?(sub_role.id) %>> - <h2><%= sub_role.i18n_variable[I18n.locale] %></h2> + <h2><%= sub_role.title %></h2> <div class="info_input"> <table border="0" cellspacing="0" cellpadding="0"> <thead class="list_head"> @@ -14,7 +14,7 @@ <% sub_role.get_enabled_attribute_fields.each do |attr| %> <%= f.fields_for :attribute_values, @user.get_value_from_field_id(attr.id) do |f| %> <tr class="list_item"> - <td><%= attr.i18n_variable[I18n.locale] %></td> + <td><%= attr.title %></td> <% if attr["locale"] && attr["markup"] == 'text_field' %> <% @site_valid_locales.each do |locale| %> <td><%= f.text_field locale %></td> diff --git a/app/views/admin/users/_sub_role_selector.html.erb b/app/views/admin/users/_sub_role_selector.html.erb index 2305cb475..4ab201c0c 100644 --- a/app/views/admin/users/_sub_role_selector.html.erb +++ b/app/views/admin/users/_sub_role_selector.html.erb @@ -1,4 +1,4 @@ <% role.sub_roles.each do |sub_role| %> - <%= f.label sub_role.i18n_variable[I18n.locale], :for => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %> + <%= f.label sub_role.title, :for => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %> <%= check_box_tag "user[sub_role_ids][]", sub_role.id, @user.sub_role_ids.include?(sub_role.id), :id => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %> <% end %> \ No newline at end of file diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index cb794ccf7..7f58cbf85 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -20,7 +20,7 @@ <tbody> <% @users.each do |user| %> <tr class="have"> - <td class="roles <%= user.role.key.downcase rescue nil %>"><%= user.role.i18n_variable[I18n.locale] rescue nil %></td> + <td class="roles <%= user.role.key.downcase rescue nil %>"><%= user.role.title rescue nil %></td> <td class="name"><%= user.name ? user.name : 'bob' %></td> <td class="email"><%= user.email %></td> <td class="admin"><%= user.admin ? t(:yes_) : t(:no_) %></td> diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index c9b3d696b..ca5fb7e06 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -14,14 +14,14 @@ </div> <% @infos.each do |a| %> <div id="basic_block" class="roles_block <%= @class %>"> - <h2><%= a.i18n_variable[I18n.locale] %></h2> + <h2><%= a.title %></h2> <hr> <%= render :partial => 'show_attribute', :object => a %> </div> <% end -%> <div id="basic_block" class="roles_block <%= @class %>"> - <h2><%= @user.role.i18n_variable[I18n.locale] %></h2> + <h2><%= @user.role.title %></h2> <hr class="<%= @user.role.key %>_block"> <%= render :partial => 'show_sub_role', :collection => @user.sub_roles %> </div> From 74c135f42f4f02d87edb2936014744d2f9243f11 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou <chris.vilayphiou@gmail.com> Date: Thu, 26 Jul 2012 06:02:22 +0800 Subject: [PATCH 10/15] Remove i18n_variable for parser --- lib/parsers/parser_common.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 308620238..c02976993 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -28,7 +28,7 @@ module ParserCommon res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page)) res << "'>" root = "/" - res << "<a href='#{edit ? root + admin_page_path(page.id) : (page._type.eql?('Page') ? root + page.path : page.url)}'><span>#{page.i18n_variable[I18n.locale]}</span></a>" + res << "<a href='#{edit ? root + admin_page_path(page.id) : (page._type.eql?('Page') ? root + page.path : page.url)}'><span>#{page.title}</span></a>" if page.visible_children.size > 0 && current < menu.levels res << "<span class='dot'></span>" res << menu_level(page, current_page, current + 1, menu, edit) @@ -68,7 +68,7 @@ module ParserCommon printable_ad_images.shuffle! printable_ad_images.each do |ad_image| #TODO Need Reflact res << "<img src='#{ad_image.file}' " - res << "alt='#{ad_image.title[I18n.locale] || ' '}' " + res << "alt='#{ad_image.title || ' '}' " res << "time_to_next='#{ad_banner.transition_msec}' " res << "link_open='#{ad_image.link_open}' " # res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' " @@ -116,12 +116,12 @@ module ParserCommon res = '' if menu_page && menu_page.visible_children.size > 0 res << "<div class='category_list'>" - res << "<h3 class='h3'>#{menu_page.i18n_variable[I18n.locale]}</h3>" + res << "<h3 class='h3'>#{menu_page.title}</h3>" res << "<ul class='list'>" menu_page.visible_children.each do |child| res << "<li class='#{page.id.eql?(child.id) ? 'active' : nil}'>" root = "/" - res << "<a href='#{edit ? root + admin_page_path(child.id) : (child._type.eql?('Page') ? root + child.path : child.url)}'>#{child.i18n_variable[I18n.locale]}</a>" + res << "<a href='#{edit ? root + admin_page_path(child.id) : (child._type.eql?('Page') ? root + child.path : child.url)}'>#{child.title}</a>" res << "</li>" end res << "</ul>" @@ -138,7 +138,7 @@ module ParserCommon page_footer = body.css('.page_footer').first if page_footer res = "<div id='#{page_footer['id']}', class='#{page_footer['class']}'>" - res << @site.footer[I18n.locale] rescue nil + res << @site.footer rescue nil res << "</div>" fragment = Nokogiri::HTML::DocumentFragment.new(body ,res) page_footer.swap(fragment) rescue nil @@ -152,7 +152,7 @@ module ParserCommon page_sub_menu = body.css('.page_sub_menu').first if page_sub_menu res = "<div id='#{page_sub_menu['id']}', class='#{page_sub_menu['class']}'>" - res << @site.sub_menu[I18n.locale] rescue nil + res << @site.sub_menu rescue nil res << "</div>" fragment = Nokogiri::HTML::DocumentFragment.new(body ,res) page_sub_menu.swap(fragment) rescue nil @@ -175,7 +175,7 @@ module ParserCommon ret << "'></div>" else part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil - part_title = part.title[I18n.locale] rescue nil + part_title = part.title rescue nil if edit ret << "<div id='#{content['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>" if part ret << "<div class='edit_link' style='display:none'>" @@ -184,7 +184,7 @@ module ParserCommon end case part.kind when 'text' - ret << part.i18n_variable[I18n.locale] rescue '' + ret << part.content rescue '' when 'module_widget' url = "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true" options = "&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}" From b6f2325de6cfaf603c93373d0818a05434f2b8d6 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou <chris.vilayphiou@gmail.com> Date: Thu, 26 Jul 2012 06:30:26 +0800 Subject: [PATCH 11/15] Fix bugs after removal of i18n_variable --- app/models/page.rb | 2 +- lib/tasks/migrate.rake | 595 ++++++++++++++++++++--------------------- 2 files changed, 298 insertions(+), 299 deletions(-) diff --git a/app/models/page.rb b/app/models/page.rb index cb86c842f..bddb9872d 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -18,7 +18,7 @@ class Page < Item has_many :page_metas, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :page_parts, :allow_destroy => true - before_save :create_parts, :set_key + before_save :create_parts # embeds_many :custom_images, :class_name => 'Image', as: :design_image diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index a13e0ff3e..c9b43e0b0 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -4,355 +4,354 @@ namespace :migrate do task :i18n => :environment do - p 'Start Bulletin' - bulletins = Bulletin.admin_manager_all - i = 1 - bulletins.each do |bulletin| - p "#{i}/#{bulletins.size} - #{bulletin.id}" - title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) - bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) - bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle - text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) - bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text - bulletin.save(:validate => false) - i += 1 - end - p 'End Bulletin' + # p 'Start Bulletin' + # bulletins = Bulletin.admin_manager_all + # i = 1 + # bulletins.each do |bulletin| + # p "#{i}/#{bulletins.size} - #{bulletin.id}" + # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + # bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + # bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle + # text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + # bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text + # p bulletin.save(:validate => false) + # i += 1 + # end + # p 'End Bulletin' - p '=====================================================' + # p '=====================================================' - p 'Start BulletinCategory' - categories = BulletinCategory.admin_manager_all - i = 1 - categories.each do |category| - p "#{i}/#{categories.size} - #{category.id}" - title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - category.save(:validate => false) - i += 1 - end - p 'End BulletinCategory' + # p 'Start BulletinCategory' + # categories = BulletinCategory.admin_manager_all + # i = 1 + # categories.each do |category| + # p "#{i}/#{categories.size} - #{category.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p category.save(:validate => false) + # i += 1 + # end + # p 'End BulletinCategory' - p '=====================================================' + # p '=====================================================' - p 'Start BulletinFile' - files = BulletinFile.all - i = 1 - files.each do |file| - p "#{i}/#{files.size} - #{file.id}" - description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description - title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - file.save(:validate => false) - i += 1 - end - p 'End BulletinFile' + # p 'Start BulletinFile' + # files = BulletinFile.all + # i = 1 + # files.each do |file| + # p "#{i}/#{files.size} - #{file.id}" + # description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + # file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + # title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + # file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p file.save(:validate => false) + # i += 1 + # end + # p 'End BulletinFile' - p '=====================================================' + # p '=====================================================' - p 'Start BulletinLink' - links = BulletinLink.all - i = 1 - links.each do |link| - p "#{i}/#{links.size} - #{link.id}" - title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) - link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - link.save(:validate => false) - i += 1 - end - p 'End BulletinLink' + # p 'Start BulletinLink' + # links = BulletinLink.all + # i = 1 + # links.each do |link| + # p "#{i}/#{links.size} - #{link.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) + # link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p link.save(:validate => false) + # i += 1 + # end + # p 'End BulletinLink' - p '=====================================================' + # p '=====================================================' - p 'Start UnitListForAnc' - units = UnitListForAnc.all - i = 1 - units.each do |unit| - p "#{i}/#{units.size} - #{unit.id}" - title = I18nVariable.first(:conditions => {:language_value_id => unit.id, :language_value_type => unit.class}) - unit.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - unit.save(:validate => false) - i += 1 - end - p 'End UnitListForAnc' + # p 'Start UnitListForAnc' + # units = UnitListForAnc.all + # i = 1 + # units.each do |unit| + # p "#{i}/#{units.size} - #{unit.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => unit.id, :language_value_type => unit.class}) + # unit.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p unit.save(:validate => false) + # i += 1 + # end + # p 'End UnitListForAnc' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start NewsBulletin' - news_bulletins = NewsBulletin.admin_manager_all - i = 1 - news_bulletins.each do |news_bulletin| - p "#{i}/#{news_bulletins.size} - #{news_bulletin.id}" - title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) - news_bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) - news_bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle - text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) - news_bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text - news_bulletin.save(:validate => false) - i += 1 - end - p 'End NewsBulletin' + # p 'Start NewsBulletin' + # news_bulletins = NewsBulletin.admin_manager_all + # i = 1 + # news_bulletins.each do |news_bulletin| + # p "#{i}/#{news_bulletins.size} - #{news_bulletin.id}" + # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) + # news_bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) + # news_bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle + # text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) + # news_bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text + # p news_bulletin.save(:validate => false) + # i += 1 + # end + # p 'End NewsBulletin' - p '=====================================================' + # p '=====================================================' - p 'Start NewsBulletinCategory' - categories = NewsBulletinCategory.admin_manager_all - i = 1 - categories.each do |category| - p "#{i}/#{categories.size} - #{category.id}" - title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - category.save(:validate => false) - i += 1 - end - p 'End NewsBulletinCategory' + # p 'Start NewsBulletinCategory' + # categories = NewsBulletinCategory.admin_manager_all + # i = 1 + # categories.each do |category| + # p "#{i}/#{categories.size} - #{category.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p category.save(:validate => false) + # i += 1 + # end + # p 'End NewsBulletinCategory' - p '=====================================================' + # p '=====================================================' - p 'Start NewsBulletinFile' - files = NewsBulletinFile.all - i = 1 - files.each do |file| - p "#{i}/#{files.size} - #{file.id}" - description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description - title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - file.save(:validate => false) - i += 1 - end - p 'End NewsBulletinFile' + # p 'Start NewsBulletinFile' + # files = NewsBulletinFile.all + # i = 1 + # files.each do |file| + # p "#{i}/#{files.size} - #{file.id}" + # description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + # file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + # title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + # file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p file.save(:validate => false) + # i += 1 + # end + # p 'End NewsBulletinFile' - p '=====================================================' + # p '=====================================================' - p 'Start NewsBulletinLink' - links = NewsBulletinLink.all - i = 1 - links.each do |link| - p "#{i}/#{links.size} - #{link.id}" - title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) - link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - link.save(:validate => false) - i += 1 - end - p 'End NewsBulletinLink' + # p 'Start NewsBulletinLink' + # links = NewsBulletinLink.all + # i = 1 + # links.each do |link| + # p "#{i}/#{links.size} - #{link.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) + # link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p link.save(:validate => false) + # i += 1 + # end + # p 'End NewsBulletinLink' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start PageContext' - page_contexts = PageContext.all - i = 1 - page_contexts.each do |page_context| - p "#{i}/#{page_contexts.size} - #{page_context.id}" - context = I18nVariable.first(:conditions => {:language_value_id => page_context.id, :language_value_type => page_context.class}) - page_context.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context - page_context.save(:validate => false) - i += 1 - end - p 'End PageContext' + # p 'Start PageContext' + # page_contexts = PageContext.all + # i = 1 + # page_contexts.each do |page_context| + # p "#{i}/#{page_contexts.size} - #{page_context.id}" + # context = I18nVariable.first(:conditions => {:language_value_id => page_context.id, :language_value_type => page_context.class}) + # page_context.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context + # p page_context.save(:validate => false) + # i += 1 + # end + # p 'End PageContext' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start WebLink' - links = WebLink.all - i = 1 - links.each do |link| - p "#{i}/#{links.size} - #{link.id}" - # the original key was 'name' - title = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class}) - link.name_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - context = I18nVariable.first(:conditions => {:key => 'context', :language_value_id => link.id, :language_value_type => link.class}) - link.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context - link.save(:validate => false) - i += 1 - end - p 'End WebLink' + # p 'Start WebLink' + # links = WebLink.all + # i = 1 + # links.each do |link| + # p "#{i}/#{links.size} - #{link.id}" + # # the original key was 'name' + # title = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class}) + # link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # context = I18nVariable.first(:conditions => {:key => 'context', :language_value_id => link.id, :language_value_type => link.class}) + # link.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context + # p link.save(:validate => false) + # i += 1 + # end + # p 'End WebLink' - p '=====================================================' + # p '=====================================================' - p 'Start WebLinkCategory' - categories = WebLinkCategory.admin_manager_all - i = 1 - categories.each do |category| - p "#{i}/#{categories.size} - #{category.id}" - title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - category.save(:validate => false) - i += 1 - end - p 'End WebLinkCategory' + # p 'Start WebLinkCategory' + # categories = WebLinkCategory.admin_manager_all + # i = 1 + # categories.each do |category| + # p "#{i}/#{categories.size} - #{category.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p category.save(:validate => false) + # i += 1 + # end + # p 'End WebLinkCategory' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start Meta' - metas = Meta.all - i = 1 - metas.each do |meta| - p "#{i}/#{metas.size} - #{meta.id}" - title = I18nVariable.first(:conditions => {:language_value_id => meta.id, :language_value_type => meta.class}) - meta.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - meta.save(:validate => false) - i += 1 - end - p 'End Meta' + # p 'Start Meta' + # metas = Meta.all + # i = 1 + # metas.each do |meta| + # p "#{i}/#{metas.size} - #{meta.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => meta.id, :language_value_type => meta.class}) + # meta.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p meta.save(:validate => false) + # i += 1 + # end + # p 'End Meta' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start Attribute' - attributes = Attribute.all - i = 1 - attributes.each do |attribute| - p "#{i}/#{attributes.size} - #{attribute.id}" - title = I18nVariable.first(:conditions => {:language_value_id => attribute.id, :language_value_type => attribute.class}) - attribute.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - attribute.save(:validate => false) - i += 1 - end - p 'End Attribute' + # p 'Start Attribute' + # attributes = Attribute.all + # i = 1 + # attributes.each do |attribute| + # p "#{i}/#{attributes.size} - #{attribute.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => attribute.id, :language_value_type => attribute.class}) + # attribute.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p attribute.save(:validate => false) + # i += 1 + # end + # p 'End Attribute' - p '=====================================================' + # p '=====================================================' - p 'Start AttributeField' - attribute_fields = AttributeField.all - i = 1 - attribute_fields.each do |attribute_field| - p "#{i}/#{attribute_fields.size} - #{attribute_field.id}" - title = I18nVariable.first(:conditions => {:language_value_id => attribute_field.id, :language_value_type => attribute_field.class}) - attribute_field.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - attribute_field.save(:validate => false) - i += 1 - end - p 'End AttributeField' + # p 'Start AttributeField' + # attribute_fields = AttributeField.all + # i = 1 + # attribute_fields.each do |attribute_field| + # p "#{i}/#{attribute_fields.size} - #{attribute_field.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => attribute_field.id, :language_value_type => attribute_field.class}) + # attribute_field.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p attribute_field.save(:validate => false) + # i += 1 + # end + # p 'End AttributeField' - p '=====================================================' + # p '=====================================================' - p 'Start Role' - roles = Role.all - i = 1 - roles.each do |role| - p "#{i}/#{roles.size} - #{role.id}" - title = I18nVariable.first(:conditions => {:language_value_id => role.id, :language_value_type => role.class}) - role.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - role.save(:validate => false) - i += 1 - end - p 'End Role' + # p 'Start Role' + # roles = Role.all + # i = 1 + # roles.each do |role| + # p "#{i}/#{roles.size} - #{role.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => role.id, :language_value_type => role.class}) + # role.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p role.save(:validate => false) + # i += 1 + # end + # p 'End Role' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start AdImage' - ad_images = AdImage.all - i = 1 - ad_images.each do |image| - p "#{i}/#{ad_images.size} - #{image.id}" - # no key is set and title = context, this is due to original error in the code - title = I18nVariable.first(:conditions => {:language_value_id => image.id, :language_value_type => image.class}) - image.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - image.context_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - image.save(:validate => false) - i += 1 - end - p 'End AdImage' + # p 'Start AdImage' + # ad_images = AdImage.all + # i = 1 + # ad_images.each do |image| + # p "#{i}/#{ad_images.size} - #{image.id}" + # # no key is set and title = context, this is due to original error in the code + # title = I18nVariable.first(:conditions => {:language_value_id => image.id, :language_value_type => image.class}) + # image.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # image.context_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p image.save(:validate => false) + # i += 1 + # end + # p 'End AdImage' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start Asset' - assets = Asset.all - i = 1 - assets.each do |asset| - p "#{i}/#{assets.size} - #{asset.id}" - title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => asset.id, :language_value_type => asset.class}) - asset.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - description = I18nVariable.first(:conditions => {:key => 'description', :language_value_id => asset.id, :language_value_type => asset.class}) - asset.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description - asset.save(:validate => false) - i += 1 - end - p 'End Asset' + # p 'Start Asset' + # assets = Asset.all + # i = 1 + # assets.each do |asset| + # p "#{i}/#{assets.size} - #{asset.id}" + # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => asset.id, :language_value_type => asset.class}) + # asset.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # description = I18nVariable.first(:conditions => {:key => 'description', :language_value_id => asset.id, :language_value_type => asset.class}) + # asset.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + # p asset.save(:validate => false) + # i += 1 + # end + # p 'End Asset' - p '=====================================================' + # p '=====================================================' - p 'Start AssetCategory' - categories = AssetCategory.all - i = 1 - categories.each do |category| - p "#{i}/#{categories.size} - #{category.id}" - title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - category.save(:validate => false) - i += 1 - end - p 'End AssetCategory' + # p 'Start AssetCategory' + # categories = AssetCategory.all + # i = 1 + # categories.each do |category| + # p "#{i}/#{categories.size} - #{category.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p category.save(:validate => false) + # i += 1 + # end + # p 'End AssetCategory' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' - p 'Start Item' - items = Item.all - i = 1 - items.each do |item| - p "#{i}/#{items.size} - #{item.id}" - title = I18nVariable.first(:conditions => {:language_value_id => item.id, :language_value_type => item.class}) - item.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - item.save(:validate => false) - i += 1 - end - p 'End Item' + # p 'Start Item' + # items = Item.all + # i = 1 + # items.each do |item| + # p "#{i}/#{items.size} - #{item.id}" + # title = I18nVariable.first(:conditions => {:language_value_id => item.id, :language_value_type => item.class}) + # item.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p item.save(:validate => false) + # i += 1 + # end + # p 'End Item' - p '=====================================================' + # p '=====================================================' - p 'Start Page' - pages = Page.all - i = 1 - pages.each do |item| - p "#{i}/#{pages.size} - #{item.id}" - # the key was originally 'title', changed to 'page_title' to avoit conflict with parent - title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => item.id, :language_value_type => item.class}) - item.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - item.save(:validate => false) - i += 1 - end - p 'End Page' + # p 'Start Page' + # pages = Page.all + # i = 1 + # pages.each do |item| + # p "#{i}/#{pages.size} - #{item.id}" + # # the key was originally 'title', changed to 'page_title' to avoit conflict with parent + # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => item.id, :language_value_type => item.class}) + # item.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # p item.save(:validate => false) + # i += 1 + # end + # p 'End Page' - p '=====================================================' + # p '=====================================================' - p 'Start PagePart' - page_parts = PagePart.all - i = 1 - page_parts.each do |part| - p "#{i}/#{page_parts.size} - #{part.id}" - title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class}) - part.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - content = I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => part.id, :language_value_type => part.class}) - part.content_translations = {'en' => content['en'], 'zh_tw' => content['zh_tw']} if content - part.save(:validate => false) - i += 1 - end - p 'End PagePart' + # p 'Start PagePart' + # page_parts = PagePart.all + # i = 1 + # page_parts.each do |part| + # p "#{i}/#{page_parts.size} - #{part.id}" + # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class}) + # part.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + # content = I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => part.id, :language_value_type => part.class}) + # part.content_translations = {'en' => content['en'], 'zh_tw' => content['zh_tw']} if content + # p part.save(:validate => false) + # i += 1 + # end + # p 'End PagePart' - p '=====================================================' - p '=====================================================' + # p '=====================================================' + # p '=====================================================' p 'Start Site' site = Site.first - title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class}) + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => site.id, :language_value_type => site.class}) site.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title footer = I18nVariable.first(:conditions => {:key => 'footer', :language_value_id => site.id, :language_value_type => site.class}) site.footer_translations = {'en' => footer['en'], 'zh_tw' => footer['zh_tw']} if footer sub_menu = I18nVariable.first(:conditions => {:key => 'sub_menu', :language_value_id => site.id, :language_value_type => site.class}) site.sub_menu_translations = {'en' => sub_menu['en'], 'zh_tw' => sub_menu['zh_tw']} if sub_menu - site.save(:validate => false) - end + p site.save(:validate => false) p 'End Site' end From b7cc38c1958ebc9c0e51799c1d2384ece6fcacf0 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou <chris.vilayphiou@gmail.com> Date: Thu, 26 Jul 2012 06:40:16 +0800 Subject: [PATCH 12/15] Remove comments in migrate task --- lib/tasks/migrate.rake | 590 ++++++++++++++++++++--------------------- 1 file changed, 295 insertions(+), 295 deletions(-) diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake index c9b43e0b0..8b92ea9eb 100644 --- a/lib/tasks/migrate.rake +++ b/lib/tasks/migrate.rake @@ -4,344 +4,344 @@ namespace :migrate do task :i18n => :environment do - # p 'Start Bulletin' - # bulletins = Bulletin.admin_manager_all - # i = 1 - # bulletins.each do |bulletin| - # p "#{i}/#{bulletins.size} - #{bulletin.id}" - # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) - # bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) - # bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle - # text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) - # bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text - # p bulletin.save(:validate => false) - # i += 1 - # end - # p 'End Bulletin' + p 'Start Bulletin' + bulletins = Bulletin.admin_manager_all + i = 1 + bulletins.each do |bulletin| + p "#{i}/#{bulletins.size} - #{bulletin.id}" + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle + text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => bulletin.id, :language_value_type => bulletin.class}) + bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text + p bulletin.save(:validate => false) + i += 1 + end + p 'End Bulletin' - # p '=====================================================' + p '=====================================================' - # p 'Start BulletinCategory' - # categories = BulletinCategory.admin_manager_all - # i = 1 - # categories.each do |category| - # p "#{i}/#{categories.size} - #{category.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p category.save(:validate => false) - # i += 1 - # end - # p 'End BulletinCategory' + p 'Start BulletinCategory' + categories = BulletinCategory.admin_manager_all + i = 1 + categories.each do |category| + p "#{i}/#{categories.size} - #{category.id}" + title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p category.save(:validate => false) + i += 1 + end + p 'End BulletinCategory' - # p '=====================================================' + p '=====================================================' - # p 'Start BulletinFile' - # files = BulletinFile.all - # i = 1 - # files.each do |file| - # p "#{i}/#{files.size} - #{file.id}" - # description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - # file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description - # title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - # file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p file.save(:validate => false) - # i += 1 - # end - # p 'End BulletinFile' + p 'Start BulletinFile' + files = BulletinFile.all + i = 1 + files.each do |file| + p "#{i}/#{files.size} - #{file.id}" + description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p file.save(:validate => false) + i += 1 + end + p 'End BulletinFile' - # p '=====================================================' + p '=====================================================' - # p 'Start BulletinLink' - # links = BulletinLink.all - # i = 1 - # links.each do |link| - # p "#{i}/#{links.size} - #{link.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) - # link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p link.save(:validate => false) - # i += 1 - # end - # p 'End BulletinLink' + p 'Start BulletinLink' + links = BulletinLink.all + i = 1 + links.each do |link| + p "#{i}/#{links.size} - #{link.id}" + title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) + link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p link.save(:validate => false) + i += 1 + end + p 'End BulletinLink' - # p '=====================================================' + p '=====================================================' - # p 'Start UnitListForAnc' - # units = UnitListForAnc.all - # i = 1 - # units.each do |unit| - # p "#{i}/#{units.size} - #{unit.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => unit.id, :language_value_type => unit.class}) - # unit.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p unit.save(:validate => false) - # i += 1 - # end - # p 'End UnitListForAnc' + p 'Start UnitListForAnc' + units = UnitListForAnc.all + i = 1 + units.each do |unit| + p "#{i}/#{units.size} - #{unit.id}" + title = I18nVariable.first(:conditions => {:language_value_id => unit.id, :language_value_type => unit.class}) + unit.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p unit.save(:validate => false) + i += 1 + end + p 'End UnitListForAnc' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start NewsBulletin' - # news_bulletins = NewsBulletin.admin_manager_all - # i = 1 - # news_bulletins.each do |news_bulletin| - # p "#{i}/#{news_bulletins.size} - #{news_bulletin.id}" - # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) - # news_bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) - # news_bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle - # text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) - # news_bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text - # p news_bulletin.save(:validate => false) - # i += 1 - # end - # p 'End NewsBulletin' + p 'Start NewsBulletin' + news_bulletins = NewsBulletin.admin_manager_all + i = 1 + news_bulletins.each do |news_bulletin| + p "#{i}/#{news_bulletins.size} - #{news_bulletin.id}" + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) + news_bulletin.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + subtitle = I18nVariable.first(:conditions => {:key => 'subtitle', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) + news_bulletin.subtitle_translations = {'en' => subtitle['en'], 'zh_tw' => subtitle['zh_tw']} if subtitle + text = I18nVariable.first(:conditions => {:key => 'text', :language_value_id => news_bulletin.id, :language_value_type => news_bulletin.class}) + news_bulletin.text_translations = {'en' => text['en'], 'zh_tw' => text['zh_tw']} if text + p news_bulletin.save(:validate => false) + i += 1 + end + p 'End NewsBulletin' - # p '=====================================================' + p '=====================================================' - # p 'Start NewsBulletinCategory' - # categories = NewsBulletinCategory.admin_manager_all - # i = 1 - # categories.each do |category| - # p "#{i}/#{categories.size} - #{category.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p category.save(:validate => false) - # i += 1 - # end - # p 'End NewsBulletinCategory' + p 'Start NewsBulletinCategory' + categories = NewsBulletinCategory.admin_manager_all + i = 1 + categories.each do |category| + p "#{i}/#{categories.size} - #{category.id}" + title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p category.save(:validate => false) + i += 1 + end + p 'End NewsBulletinCategory' - # p '=====================================================' + p '=====================================================' - # p 'Start NewsBulletinFile' - # files = NewsBulletinFile.all - # i = 1 - # files.each do |file| - # p "#{i}/#{files.size} - #{file.id}" - # description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - # file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description - # title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) - # file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p file.save(:validate => false) - # i += 1 - # end - # p 'End NewsBulletinFile' + p 'Start NewsBulletinFile' + files = NewsBulletinFile.all + i = 1 + files.each do |file| + p "#{i}/#{files.size} - #{file.id}" + description = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + file.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + title = I18nVariable.first(:conditions => {:language_value_id => file.id, :language_value_type => file.class}) + file.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p file.save(:validate => false) + i += 1 + end + p 'End NewsBulletinFile' - # p '=====================================================' + p '=====================================================' - # p 'Start NewsBulletinLink' - # links = NewsBulletinLink.all - # i = 1 - # links.each do |link| - # p "#{i}/#{links.size} - #{link.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) - # link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p link.save(:validate => false) - # i += 1 - # end - # p 'End NewsBulletinLink' + p 'Start NewsBulletinLink' + links = NewsBulletinLink.all + i = 1 + links.each do |link| + p "#{i}/#{links.size} - #{link.id}" + title = I18nVariable.first(:conditions => {:language_value_id => link.id, :language_value_type => link.class}) + link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p link.save(:validate => false) + i += 1 + end + p 'End NewsBulletinLink' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start PageContext' - # page_contexts = PageContext.all - # i = 1 - # page_contexts.each do |page_context| - # p "#{i}/#{page_contexts.size} - #{page_context.id}" - # context = I18nVariable.first(:conditions => {:language_value_id => page_context.id, :language_value_type => page_context.class}) - # page_context.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context - # p page_context.save(:validate => false) - # i += 1 - # end - # p 'End PageContext' + p 'Start PageContext' + page_contexts = PageContext.all + i = 1 + page_contexts.each do |page_context| + p "#{i}/#{page_contexts.size} - #{page_context.id}" + context = I18nVariable.first(:conditions => {:language_value_id => page_context.id, :language_value_type => page_context.class}) + page_context.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context + p page_context.save(:validate => false) + i += 1 + end + p 'End PageContext' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start WebLink' - # links = WebLink.all - # i = 1 - # links.each do |link| - # p "#{i}/#{links.size} - #{link.id}" - # # the original key was 'name' - # title = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class}) - # link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # context = I18nVariable.first(:conditions => {:key => 'context', :language_value_id => link.id, :language_value_type => link.class}) - # link.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context - # p link.save(:validate => false) - # i += 1 - # end - # p 'End WebLink' + p 'Start WebLink' + links = WebLink.all + i = 1 + links.each do |link| + p "#{i}/#{links.size} - #{link.id}" + # the original key was 'name' + title = I18nVariable.first(:conditions => {:key => 'name', :language_value_id => link.id, :language_value_type => link.class}) + link.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + context = I18nVariable.first(:conditions => {:key => 'context', :language_value_id => link.id, :language_value_type => link.class}) + link.context_translations = {'en' => context['en'], 'zh_tw' => context['zh_tw']} if context + p link.save(:validate => false) + i += 1 + end + p 'End WebLink' - # p '=====================================================' + p '=====================================================' - # p 'Start WebLinkCategory' - # categories = WebLinkCategory.admin_manager_all - # i = 1 - # categories.each do |category| - # p "#{i}/#{categories.size} - #{category.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p category.save(:validate => false) - # i += 1 - # end - # p 'End WebLinkCategory' + p 'Start WebLinkCategory' + categories = WebLinkCategory.admin_manager_all + i = 1 + categories.each do |category| + p "#{i}/#{categories.size} - #{category.id}" + title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p category.save(:validate => false) + i += 1 + end + p 'End WebLinkCategory' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start Meta' - # metas = Meta.all - # i = 1 - # metas.each do |meta| - # p "#{i}/#{metas.size} - #{meta.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => meta.id, :language_value_type => meta.class}) - # meta.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p meta.save(:validate => false) - # i += 1 - # end - # p 'End Meta' + p 'Start Meta' + metas = Meta.all + i = 1 + metas.each do |meta| + p "#{i}/#{metas.size} - #{meta.id}" + title = I18nVariable.first(:conditions => {:language_value_id => meta.id, :language_value_type => meta.class}) + meta.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p meta.save(:validate => false) + i += 1 + end + p 'End Meta' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start Attribute' - # attributes = Attribute.all - # i = 1 - # attributes.each do |attribute| - # p "#{i}/#{attributes.size} - #{attribute.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => attribute.id, :language_value_type => attribute.class}) - # attribute.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p attribute.save(:validate => false) - # i += 1 - # end - # p 'End Attribute' + p 'Start Attribute' + attributes = Attribute.all + i = 1 + attributes.each do |attribute| + p "#{i}/#{attributes.size} - #{attribute.id}" + title = I18nVariable.first(:conditions => {:language_value_id => attribute.id, :language_value_type => attribute.class}) + attribute.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p attribute.save(:validate => false) + i += 1 + end + p 'End Attribute' - # p '=====================================================' + p '=====================================================' - # p 'Start AttributeField' - # attribute_fields = AttributeField.all - # i = 1 - # attribute_fields.each do |attribute_field| - # p "#{i}/#{attribute_fields.size} - #{attribute_field.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => attribute_field.id, :language_value_type => attribute_field.class}) - # attribute_field.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p attribute_field.save(:validate => false) - # i += 1 - # end - # p 'End AttributeField' + p 'Start AttributeField' + attribute_fields = AttributeField.all + i = 1 + attribute_fields.each do |attribute_field| + p "#{i}/#{attribute_fields.size} - #{attribute_field.id}" + title = I18nVariable.first(:conditions => {:language_value_id => attribute_field.id, :language_value_type => attribute_field.class}) + attribute_field.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p attribute_field.save(:validate => false) + i += 1 + end + p 'End AttributeField' - # p '=====================================================' + p '=====================================================' - # p 'Start Role' - # roles = Role.all - # i = 1 - # roles.each do |role| - # p "#{i}/#{roles.size} - #{role.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => role.id, :language_value_type => role.class}) - # role.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p role.save(:validate => false) - # i += 1 - # end - # p 'End Role' + p 'Start Role' + roles = Role.all + i = 1 + roles.each do |role| + p "#{i}/#{roles.size} - #{role.id}" + title = I18nVariable.first(:conditions => {:language_value_id => role.id, :language_value_type => role.class}) + role.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p role.save(:validate => false) + i += 1 + end + p 'End Role' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start AdImage' - # ad_images = AdImage.all - # i = 1 - # ad_images.each do |image| - # p "#{i}/#{ad_images.size} - #{image.id}" - # # no key is set and title = context, this is due to original error in the code - # title = I18nVariable.first(:conditions => {:language_value_id => image.id, :language_value_type => image.class}) - # image.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # image.context_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p image.save(:validate => false) - # i += 1 - # end - # p 'End AdImage' + p 'Start AdImage' + ad_images = AdImage.all + i = 1 + ad_images.each do |image| + p "#{i}/#{ad_images.size} - #{image.id}" + # no key is set and title = context, this is due to original error in the code + title = I18nVariable.first(:conditions => {:language_value_id => image.id, :language_value_type => image.class}) + image.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + image.context_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p image.save(:validate => false) + i += 1 + end + p 'End AdImage' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start Asset' - # assets = Asset.all - # i = 1 - # assets.each do |asset| - # p "#{i}/#{assets.size} - #{asset.id}" - # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => asset.id, :language_value_type => asset.class}) - # asset.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # description = I18nVariable.first(:conditions => {:key => 'description', :language_value_id => asset.id, :language_value_type => asset.class}) - # asset.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description - # p asset.save(:validate => false) - # i += 1 - # end - # p 'End Asset' + p 'Start Asset' + assets = Asset.all + i = 1 + assets.each do |asset| + p "#{i}/#{assets.size} - #{asset.id}" + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => asset.id, :language_value_type => asset.class}) + asset.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + description = I18nVariable.first(:conditions => {:key => 'description', :language_value_id => asset.id, :language_value_type => asset.class}) + asset.description_translations = {'en' => description['en'], 'zh_tw' => description['zh_tw']} if description + p asset.save(:validate => false) + i += 1 + end + p 'End Asset' - # p '=====================================================' + p '=====================================================' - # p 'Start AssetCategory' - # categories = AssetCategory.all - # i = 1 - # categories.each do |category| - # p "#{i}/#{categories.size} - #{category.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) - # category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p category.save(:validate => false) - # i += 1 - # end - # p 'End AssetCategory' + p 'Start AssetCategory' + categories = AssetCategory.all + i = 1 + categories.each do |category| + p "#{i}/#{categories.size} - #{category.id}" + title = I18nVariable.first(:conditions => {:language_value_id => category.id, :language_value_type => category.class}) + category.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p category.save(:validate => false) + i += 1 + end + p 'End AssetCategory' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' - # p 'Start Item' - # items = Item.all - # i = 1 - # items.each do |item| - # p "#{i}/#{items.size} - #{item.id}" - # title = I18nVariable.first(:conditions => {:language_value_id => item.id, :language_value_type => item.class}) - # item.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p item.save(:validate => false) - # i += 1 - # end - # p 'End Item' + p 'Start Item' + items = Item.all + i = 1 + items.each do |item| + p "#{i}/#{items.size} - #{item.id}" + title = I18nVariable.first(:conditions => {:language_value_id => item.id, :language_value_type => item.class}) + item.title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p item.save(:validate => false) + i += 1 + end + p 'End Item' - # p '=====================================================' + p '=====================================================' - # p 'Start Page' - # pages = Page.all - # i = 1 - # pages.each do |item| - # p "#{i}/#{pages.size} - #{item.id}" - # # the key was originally 'title', changed to 'page_title' to avoit conflict with parent - # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => item.id, :language_value_type => item.class}) - # item.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # p item.save(:validate => false) - # i += 1 - # end - # p 'End Page' + p 'Start Page' + pages = Page.all + i = 1 + pages.each do |item| + p "#{i}/#{pages.size} - #{item.id}" + # the key was originally 'title', changed to 'page_title' to avoit conflict with parent + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => item.id, :language_value_type => item.class}) + item.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + p item.save(:validate => false) + i += 1 + end + p 'End Page' - # p '=====================================================' + p '=====================================================' - # p 'Start PagePart' - # page_parts = PagePart.all - # i = 1 - # page_parts.each do |part| - # p "#{i}/#{page_parts.size} - #{part.id}" - # title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class}) - # part.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title - # content = I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => part.id, :language_value_type => part.class}) - # part.content_translations = {'en' => content['en'], 'zh_tw' => content['zh_tw']} if content - # p part.save(:validate => false) - # i += 1 - # end - # p 'End PagePart' + p 'Start PagePart' + page_parts = PagePart.all + i = 1 + page_parts.each do |part| + p "#{i}/#{page_parts.size} - #{part.id}" + title = I18nVariable.first(:conditions => {:key => 'title', :language_value_id => part.id, :language_value_type => part.class}) + part.page_title_translations = {'en' => title['en'], 'zh_tw' => title['zh_tw']} if title + content = I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => part.id, :language_value_type => part.class}) + part.content_translations = {'en' => content['en'], 'zh_tw' => content['zh_tw']} if content + p part.save(:validate => false) + i += 1 + end + p 'End PagePart' - # p '=====================================================' - # p '=====================================================' + p '=====================================================' + p '=====================================================' p 'Start Site' site = Site.first From b5dc7515f7db7dadda1b40d041e1725e67c935be Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou <chris.vilayphiou@gmail.com> Date: Thu, 26 Jul 2012 13:27:27 +0800 Subject: [PATCH 13/15] Fix bugs after i18n_variable removal --- app/models/site.rb | 14 ++++++-------- app/views/admin/sites/site_info.html.erb | 13 ++++++------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/models/site.rb b/app/models/site.rb index faa7ece37..46038eb2b 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -40,17 +40,15 @@ class Site end METAS.each do |meta| - define_method meta do + define_method meta do |locale| fetch_meta = self.site_metas.where(key: meta).limit(1) - fetch_meta.blank? ? nil : fetch_meta[0].i18n_variable + fetch_meta.blank? ? nil : fetch_meta[0].title_translations[locale] end define_method "#{meta}=" do |values| - if a = self.send(meta) - a.update_attributes(values) - else - a = self.site_metas.build(key: meta) - a.build_i18n_variable(values) - end + fetch_meta = self.site_metas.where(key: meta).limit(1)[0] rescue nil + fetch_meta = self.site_metas.build(key: meta) if fetch_meta.blank? + fetch_meta.title_translations = values + fetch_meta.save end end diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index 4ce99df13..cdd7ea541 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -38,9 +38,8 @@ <div class="control-group"> <label class="control-label"><%= t 'admin.site_keywords' %></label> <div class="controls"> - <% #TODO: set keywords into meta %> - <%= f.fields_for :keywords, @site.keywords do |f| %> - <%= f.text_area locale, :class => "input-xxlarge textarea-height-s" %> + <%= f.fields_for :keywords do |f| %> + <%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.keywords(locale) rescue nil) %> <% end %> <p class="help-block"><%= (t 'admin.site_keywords_help').html_safe %></p> </div> @@ -48,8 +47,8 @@ <div class="control-group"> <label class="control-label"><%= t 'admin.site_description' %></label> <div class="controls"> - <%= f.fields_for :description_translations do |f| %> - <%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.description_translations[locale] %> + <%= f.fields_for :description do |f| %> + <%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.description(locale) rescue nil) %> <% end %> <p class="help-block"><%= (t 'admin.site_description_help').html_safe %></p> </div> @@ -58,7 +57,7 @@ <label class="control-label"><%= t 'admin.site_footer' %></label> <div class="controls"> <%= f.fields_for :footer_translations do |f| %> - <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.footer_translations[locale] %> + <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.footer_translations[locale] rescue nil) %> <% end %> <p class="help-block"><%= (t 'admin.site_footer_help').html_safe %></p> </div> @@ -67,7 +66,7 @@ <label class="control-label"><%= t 'admin.site_sub_menu' %></label> <div class="controls"> <%= f.fields_for :sub_menu_translations do |f| %> - <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.sub_menu_translations[locale] %> + <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.sub_menu_translations[locale] rescue nil) %> <% end %> </div> </div> From 9c1eef6ce4c97a8671a7e4c07833430fcc529ee9 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com> Date: Thu, 26 Jul 2012 14:57:22 +0800 Subject: [PATCH 14/15] first version of mid_site_sync for new i18n var --- lib/tasks/mid_site_sync.rake | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/tasks/mid_site_sync.rake b/lib/tasks/mid_site_sync.rake index dacdb2e51..707a609b3 100644 --- a/lib/tasks/mid_site_sync.rake +++ b/lib/tasks/mid_site_sync.rake @@ -18,12 +18,10 @@ namespace :mid_site do sub_role = role.sub_roles.get_sub_role_from_key(key) if sub_role.nil? ut_data = ut_query.find{|ut_data| ut_data["ut_cod"] == key } - # debugger - i18n_for_new_sub_role = I18nVariable.create!( :document_class => 'SubRole', :key => key, :en => (ut_data["ut_eng_m"] rescue ''), :zh_tw => (ut_data["ut_chi_m"] rescue ''), :parent_id => role.i18n_variable.id ) sub_role = role.sub_roles.create!(:key => key) - sub_role.i18n_variable = i18n_for_new_sub_role + sub_role.title_translations ={"en" => (ut_data["ut_eng_m"] rescue ''), "zh_tw" => (ut_data["ut_chi_m"] rescue '')} sub_role.save! - p "Created SubRole(key: #{key}): EN: #{sub_role.i18n_variable.en}, CH: #{sub_role.i18n_variable.zh_tw} ParentRole(#{role.i18n_variable.key}): #{role.i18n_variable.en}" + p "Created SubRole(key: #{key}): EN: #{sub_role.title_translations['en']}, CH: #{sub_role.title_translations['zh_tw']} ParentRole(#{role.key}): #{role.title_translations['en']}" end sub_role end @@ -64,10 +62,10 @@ namespace :mid_site do user_model_mapper = Hash[:ut_cod => mid_user["ut_cod"] ,:up_ut_cod => mid_user["up_ut_cod"],:email => mid_user["eml_adr"],:off_tel_ext => mid_user["off_tel_ext"],:sta_num => mid_user["sta_num"]] user_model_mapper[:admin] = false local_user.update_attributes(user_model_mapper) - - i18n_department_admin = I18nVariable.find_or_create_by( :document_class => 'Role', :key => 'department_admin', :en => 'Department Admin', :zh_tw => '系所使用者' ) + + local_user.role = Role.find_or_create_by( :key => "department_admin",:build_in => true) - local_user.role.i18n_variable = i18n_department_admin + local_user.role.title_translations = {"en" => 'Department Admin', "zh_tw" => '系所使用者' } unless local_user.ut_cod == local_user.up_ut_cod #if the ut_cod has additions info for up ut @@ -128,15 +126,15 @@ namespace :mid_site do task :before_instll_admin => :environment do - var_1 = I18nVariable.find_or_create_by( :document_class => 'Role', :key => 'administrator', :en => 'Administrator', :zh_tw => '管理員' ) - var_1_1 = I18nVariable.find_or_create_by( :document_class => 'SubRole', :key => 'computer_center', :en => 'Computer Center', :zh_tw => '計算機中心', :parent_id => var_1.id ) + var_1 = {"en" => 'Administrator', "zh_tw" => '管理員' } + var_1_1 = {"en" => 'Computer Center', "zh_tw" => '計算機中心'} admin_role = Role.find_or_create_by( :key => 'administrator',:built_in => true) - admin_role.i18n_variable =var_1 + admin_role.title_translations =var_1 admin_role.save! sub_role = admin_role.sub_roles.find_or_create_by(:key => 'computer_center', :built_in => true) - sub_role.i18n_variable =var_1_1 + sub_role.title_translations =var_1_1 sub_role.save! #var_1_1_1 = I18nVariable.create!( :document_class => 'Attribute', :key => 'field', :en => 'Field', :zh_tw => '領域', :parent_id => var_1_1.id ) From c4722d0d2f90c6ee286eff7fca28b6d60943f966 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com> Date: Thu, 26 Jul 2012 15:44:53 +0800 Subject: [PATCH 15/15] remove cache --- Gemfile | 4 +- Gemfile.lock | 4 - app/controllers/pages_controller.rb | 2 +- config/environments/development.rb | 2 +- public/index.html | 222 ++++++++++++++++++++++ public/panel/news/widget/home_banner.html | 55 ++++++ 6 files changed, 281 insertions(+), 8 deletions(-) create mode 100644 public/index.html create mode 100644 public/panel/news/widget/home_banner.html diff --git a/Gemfile b/Gemfile index d400b8b66..7f90929ce 100644 --- a/Gemfile +++ b/Gemfile @@ -15,8 +15,8 @@ gem 'jquery-ui-rails' gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' -gem "memcached", "~> 1.4.3" -gem "memcache-client" +# gem "memcached", "~> 1.4.3" +# gem "memcache-client" gem 'mini_magick' gem 'mongoid' diff --git a/Gemfile.lock b/Gemfile.lock index abfe1fe1c..44c696169 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,8 +115,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - memcache-client (1.8.5) - memcached (1.4.3) mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) @@ -310,8 +308,6 @@ DEPENDENCIES jquery-rails jquery-ui-rails kaminari! - memcache-client - memcached (~> 1.4.3) mini_magick mongo_session_store-rails3 mongoid diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 392ffe3d2..2b57ecfa9 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -3,7 +3,7 @@ class PagesController < ApplicationController include ApplicationHelper before_filter :get_item, :only => [:index_from_link, :show_from_link] - caches_page :index +# caches_page :index def index @item = Page.find_by_name('home') diff --git a/config/environments/development.rb b/config/environments/development.rb index 048dfff1f..b940c9ce8 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -23,7 +23,7 @@ Orbit::Application.configure do # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin - config.cache_store = :mem_cache_store +# config.cache_store = :mem_cache_store config.assets.debug = true diff --git a/public/index.html b/public/index.html new file mode 100644 index 000000000..d94cc9c59 --- /dev/null +++ b/public/index.html @@ -0,0 +1,222 @@ +<!DOCTYPE HTML> +<html> +<head> +<meta charset="utf-8"> + <title>國立政治大學 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          + + +
          +
          +
          +
          +
          +
          +

          測試

          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          +
          + +
          +
          +
          +

          活動行事曆

          + + prev + next +
          +
            +
          • +
            + + +
            + +
            +
            • +
          • +
            + + +
            + +
            +
            • +
          • +
            + + +
            + +
            +
            • +
          +
          +
          +
          + +
          + +
          +
          +

          測測測測測測測測測測測測asdasdasdd

          +
          + +
          +
          +
          +
          + +
          +
          +

          本網站著作權屬於國立政治大學，請詳見使用規則。

          +

          總機電話：02-29393091
          傳真：02-29379611
          地址：11605 台北市文山區指南路二段64號

          +
          +
          +校園安全緊急通報 | 聯絡我們
          +
          +
          + + + diff --git a/public/panel/news/widget/home_banner.html b/public/panel/news/widget/home_banner.html new file mode 100644 index 000000000..fca8803bb --- /dev/null +++ b/public/panel/news/widget/home_banner.html @@ -0,0 +1,55 @@ + + + + + + + + + + + + +

          校園新聞

          +
          + + 更多+ + + + +
          +
          previous page
          +
          next page
          +
            +
          • +
            010512night_2
            +

            企管系慶50年 誓言卓越領航未來

            +

            校訊記者蕭郁蓉報導】慶祝成立50週年，企管系12日晚上舉辦「風雲50，卓越領航」系慶晚會，各屆校友返家同樂，在輕鬆的氣氛下敘舊並交流，同時宣布產業合作實習計畫啟動。

            +

            企管系發出校友召集令，席開60桌串連了50屆企管系友，還有人專程遠道從美國、馬來西亞歸國共襄盛舉。校長吳思華肯定晚會具向心力和格局，總統馬英九也特別賀電祝福活動圓滿，感謝政大企管對管理教育的深耕。

            +

            晚會在歌聲中揭開序幕，一聽到政大校歌前奏，全場師生不約而同起立同唱。晚會由學士班校友會副會長毛仁傑與奧運跆拳道金牌得主、系友陳怡安共同主持，席間陳怡安逐桌訪問各屆系友，今年剛好也是許多20屆校友們50歲生日，20屆系友都很開心能夠和企管系一起過生日。

            +

            晚會播放回顧影片〈後青春期的歲月〉，播放第1屆至第50屆的照片，讓系友重回青春歲月，歷屆系主任也上臺，象徵薪火相傳並注酒冰雕宣告「風雲50‧卓越領航」。校友傾力支持的產業實習合作計畫，也在各產業召集人簽署下正式啟動，將提供學弟妹更多實習機會。

            +

            尋找過往共同的驕傲回憶，曾經參與文化盃合唱比賽、創下十連霸的班級也再度聚首，演唱當年自選曲〈In Remembrance〉以及各年齡層系友都很熟悉的〈夜來香〉。指揮周品帆表示，現在還記得當時身負文化盃重任，心情既緊張又興奮，畢業多年還能但與當年戰友一起重溫感動，感到開心且榮幸。

            +

            企管系學士班校友會長、財信集團董事長謝金河說，政大企管系就如同偉大的母親，如果每年有100位學生，如今也孕育了5000位系友。鼓勵後輩學弟妹不要忘記好好閱讀系慶專刊，了解企管系的發展和使命，未來不忘回饋母系。

            +

            歡慶企管系學士班成立50周年，企研所校友會長、信義房屋董事長周俊吉、EMBA校友會理事長宋文琪、企家班校友會長廖宜彥、科技班校友會長邱天元、以及博士班校友、潤泰集團總裁尹衍樑也出席同歡

            +

            企管系主任蔡維奇表示，企管系慶從去年開始籌備，期間許多校友們鼎力支持，大方贊助廣告、餐費、紅酒等，還有更多企業校友踴躍返回母校分享經驗，協助學弟妹與產業連結，展現企管系大家庭的團結氣氛。期待未來能繼續攜手，共創下一個更輝煌的50年。

            +
            • +
          • +
            News2
            +

            社科院舉辦碩博士班畢業生撥穗典禮

            +

            【社會科學學院訊】為了讓所有畢業生都能親自參與撥穗過程，社會科學學院6月5日畢業典禮舉行撥穗典禮，吸引百位畢業生和家長踴躍參與，綜合院館熱鬧非凡。所有畢業生都單獨接受系主任撥穗，並由社科院長楊松齡頒發畢業證書。

            +
            • +
          • +
            03
            +

            選後兩岸與經濟發展 專家籲勇於和世界接軌

            +

            【校訊記者許瀚分報導】政大EMBA校友會23日邀請海基會副董事長高孔廉及經濟系教授林祖嘉談論「大選後的兩岸關係與臺灣經濟情勢」。兩位中國事務專家一致認為，臺灣應勇於開放與世界接軌，並盡早加入TPP(跨太平洋夥伴協議)，提高臺灣經濟競爭力。

            +
            • +
          + + +