From 3e567223e36cf3dbefd640d76489bc95d1f670c1 Mon Sep 17 00:00:00 2001 From: "Matt K. Fu" Date: Fri, 26 Apr 2013 15:37:27 +0800 Subject: [PATCH] fix for Spen's translation and Chris's tag error --- app/controllers/admin/tags_controller.rb | 4 ++-- app/models/sub_role_tag.rb | 1 - app/views/admin/attributes/edit.html.erb | 2 +- app/views/admin/attributes/index.html.erb | 2 +- app/views/admin/dashboards/index.html.erb | 2 +- app/views/admin/role_filters/index.html.erb | 2 +- app/views/admin/roles/add_sub_role.html.erb | 2 +- app/views/admin/roles/edit_sub_role.html.erb | 2 +- app/views/admin/roles/role_field.html.erb | 2 +- app/views/admin/roles/sub_role.html.erb | 2 +- app/views/admin/roles/sub_role_field.html.erb | 2 +- app/views/admin/users_new_interface/_filter.html.erb | 2 +- app/views/admin/users_new_interface/_side_bar.html.erb | 2 +- app/views/admin/users_new_interface/edit.html.erb | 2 +- app/views/admin/users_new_interface/edit_passwd.html.erb | 2 +- app/views/admin/users_new_interface/index.html.erb | 2 +- app/views/admin/users_new_interface/index_summary.html.erb | 2 +- app/views/admin/users_new_interface/index_thumbnail.html.erb | 2 +- app/views/admin/users_new_interface/new.html.erb | 2 +- app/views/admin/users_new_interface/plugin_dashbroad.html.erb | 2 +- app/views/admin/users_new_interface/show.html.erb | 2 +- app/views/admin/users_new_interface/temp_edit.html.erb | 2 +- app/views/layouts/_drop_down_menu.html.erb | 2 +- app/views/layouts/_guest_orbit_menu.erb | 2 +- app/views/layouts/_member_orbit_menu.erb | 4 ++-- config/locales/en.yml | 2 +- config/locales/zh_tw.yml | 3 ++- 27 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb index a94f62d6..444b250f 100644 --- a/app/controllers/admin/tags_controller.rb +++ b/app/controllers/admin/tags_controller.rb @@ -2,7 +2,7 @@ class Admin::TagsController < OrbitBackendController before_filter :force_order_for_visitor,:only=>[:index] before_filter :force_order_for_user,:except => [:index] before_filter :for_app_sub_manager,:except => [:index] - before_filter :set_module_app + # before_filter :set_module_app def index @tags = get_tags @@ -39,7 +39,7 @@ class Admin::TagsController < OrbitBackendController @tags = @module_app.blank? ? Tag.all : @module_app.tags end - def set_module_app + def setup_vars @module_app = ModuleApp.find(params[:module_app_id]) if params[:module_app_id] @module_app_id = @module_app.id rescue nil end diff --git a/app/models/sub_role_tag.rb b/app/models/sub_role_tag.rb index f2ff6b7b..e56b5c84 100644 --- a/app/models/sub_role_tag.rb +++ b/app/models/sub_role_tag.rb @@ -1,4 +1,3 @@ class SubRoleTag < ProtoTag has_and_belongs_to_many :sub_roles - end diff --git a/app/views/admin/attributes/edit.html.erb b/app/views/admin/attributes/edit.html.erb index 252cdf71..4e9e04c0 100644 --- a/app/views/admin/attributes/edit.html.erb +++ b/app/views/admin/attributes/edit.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %> + <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %> <% end %> <%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %> diff --git a/app/views/admin/attributes/index.html.erb b/app/views/admin/attributes/index.html.erb index 1c310114..9ac6f29e 100644 --- a/app/views/admin/attributes/index.html.erb +++ b/app/views/admin/attributes/index.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %> + <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member_), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %> <% end %> diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index dcdf5a09..8d272ae1 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -40,7 +40,7 @@