From db61ecc2559f95ee422c7cf56ec0d4a134682413 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Fri, 6 Jun 2014 16:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6user=5Fscore=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                   | 31 ++++++++++++++++++++--------
 app/views/users/_show_score.html.erb | 27 ------------------------
 app/views/users/show_score.js.erb    |  2 --
 3 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 689cc7b2e..331ff6993 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -137,7 +137,7 @@ class User < Principal
   has_one :user_extensions,:dependent => :destroy
   ## end
 
-  default_scope -> { includes(:user_extensions, :user_score) }
+  # default_scope -> { includes(:user_extensions, :user_score) }
   scope :teacher, -> {
     joins(:user_extensions).where('user_extensions.identity = ?', UserExtensions::TEACHER)
   }
@@ -201,6 +201,7 @@ class User < Principal
 
   # ======================================================================
   # 集中处理 User 扩展表为空的问题
+  # 合并 user_score 属性
   validate :valid_user_extensions
   after_save :save_user_extensions
 
@@ -208,21 +209,32 @@ class User < Principal
     self.user_extensions ||= UserExtensions.new
   end
 
+  def user_score_attr
+    self.user_score ||= UserScore.new
+  end
+
+  alias_method :ori_respond_to?, :respond_to?
   def respond_to?(m, include_private = false)
-    flag = UserExtensions.instance_methods.include? m.to_sym
-    if flag
-      flag
-    else
-      super
-    end
+    flag = false
+    flag = ori_respond_to? m.to_sym unless flag
+    flag = UserExtensions.new.respond_to? m.to_sym unless flag
+    flag = UserScore.new.respond_to? m.to_sym  unless flag
+
+    flag
   end
 
   def method_missing m, *args, &block
     if extensions.respond_to? m.to_sym
-      self.class.send :define_method, m.to_sym, *args do
+      self.class.send(:define_method, "_meta_#{m}".to_sym) do |*args, &block|
         self.extensions.__send__ m.to_sym, *args
       end
-      __send__ m.to_sym, *args, &block
+      __send__ "_meta_#{m}".to_sym, *args, &block
+
+    elsif user_score_attr.respond_to? m.to_sym
+       self.class.send(:define_method, "_meta_#{m}".to_sym) do |*args, &block|
+        self.user_score_attr.__send__ m.to_sym, *args
+      end
+      __send__ "_meta_#{m}".to_sym, *args, &block
 
     else
       super
@@ -241,6 +253,7 @@ class User < Principal
 
   def save_user_extensions
     self.extensions.save
+    self.user_score_attr.save
   end
   # 集中处理 User 扩展表为空的问题 < end
   # ======================================================================
diff --git a/app/views/users/_show_score.html.erb b/app/views/users/_show_score.html.erb
index 0297a4e02..447e04e8b 100644
--- a/app/views/users/_show_score.html.erb
+++ b/app/views/users/_show_score.html.erb
@@ -1,9 +1,7 @@
 <!-- added by bai -->
-<% unless @user.id == 1%>
 <% messages_count = @user.messages.count %>
 <% messages_score = messages_count * 0.05%>
 <% finall_messages_score = messages_score %>
-<% end %>
 
 <% journals_count = @user.journals.count %>
 <% journals_score = journals_count * 0.1 %>
@@ -73,31 +71,6 @@
 
 </div>
 
-<!-- <div class="inf_user_image">
-	<ul>
-		<li>
-			<%= link_to l(:label_user_score), {:controller => 'users', :action => 'score_index', :remote => true} %> : 
-			<%= format("%.2f" , finall_user_score).to_f %>
-		</li>
-		<li>
-			<%= link_to l(:label_user_score_of_topic), {:controller => 'users', :action => 'topic_score_index', :remote => true} %> :
-			<%= format("%.2f" , finall_messages_score).to_f %>
-	    </li>
-	    <li>
-			<%= link_to l(:label_user_score_of_project), {:controller => 'users', :action => 'project_score_index', :remote => true} %> : 
-			<%= format("%.2f" , finall_user_project_score).to_f %>
-	    </li>	
-	    <li>
-			<%= link_to l(:label_user_score_of_activity), {:controller => 'users', :action => 'activity_score_index', :remote => true} %> : 
-			<%= format("%.2f" , finall_activity_score).to_f %>
-	    </li>
-	    <li>
-			<%= link_to l(:label_user_score_of_influence), {:controller => 'users', :action => 'influence_score_index', :remote => true} %> ：
-			<%= format("%.2f" , finall_influence_score).to_f %>
-	    </li>								
-	</ul>
-</div> -->
 <div id="show_score_detail", style="padding-left: 6px">
 	<%= render :partial => 'users/score_index', :locals => {:index => 0 } %>
 </div>
-<!-- end -->
\ No newline at end of file
diff --git a/app/views/users/show_score.js.erb b/app/views/users/show_score.js.erb
index b3bbf576e..3cd9a5e47 100644
--- a/app/views/users/show_score.js.erb
+++ b/app/views/users/show_score.js.erb
@@ -1,5 +1,3 @@
-<!-- added by bai -->
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_score') %>');
 showModal('ajax-modal', '400px');
 $('#ajax-modal').addClass('new-watcher');
-<!-- end -->
\ No newline at end of file