Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/files_controller.rb

@@ -21,6 +21,7 @@ class FilesController < ApplicationController
 
   menu_item :files
   before_filter :auth_login1, :only => [:index]
+  before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]
 

app/views/forums/create_feedback.js.erb

@@ -1,6 +1,6 @@
 $(function(){
     $("#button1").click(function(){
-        myTips(<%= l(:label_feedback_success)%>,"success");
+        myTips(<%= l(:label_forums_feedback_success)%>,"success");
     });
 
 })

config/locales/zh.yml

@@ -2328,7 +2328,7 @@ zh:
   
   label_technical_support: 技术支持：
   label_feedback: 意见反馈
-  label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
+  label_forums_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"