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

Gemfile

@@ -19,6 +19,10 @@ gem 'acts-as-taggable-on'
 group :development do
   gem 'better_errors', path: 'lib/better_errors'
   gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
+  if ENV['PRY']
+    gem 'pry'
+    gem 'pry-nav'
+  end
 end
 
 # Gems used only for assets and not required

ReadMe.txt

@@ -1,11 +1,18 @@
 patch: 
-用户姓名的部分，根据issues#655。
-为了修改方便
-alias：
-方法     之前显示            调整之后
+用户姓名的部分，根据issues#655。
+为了修改方便
+alias：
+方法     之前显示            调整之后
 name     firstname+lastname  login
 nickname xxx                 login
 realname xxx                 firstname+lastname
+
+User model经过修改，已经完全集成了user_extensions的功能
+例如
+user.gender=1
+user.save
+user_extensions字段会自动保存
+不必要每次user.user_extensions.xxx以及判断是否为空
 ================================================================================
 app/models/setting.rb :165
   # fixed domain url in development. tantantan's bug
@@ -14,22 +21,22 @@ app/models/setting.rb :165
       define_singleton_method m do; nil; end if m.to_s =~ /([a-zA-Z]+_domain)$/
     end
   end
-  程序部分链接中制定了subdomain参数，使链接在二级域名中来回跳转。
-  为了开发方便，使之功能在development模式下失效。 
+  程序部分链接中制定了subdomain参数，使链接在二级域名中来回跳转。
+  为了开发方便，使之功能在development模式下失效。 
   # => nyan
 ================================================================================
 app/controller/projects_controller.rb ===> projects#fake
-  fake filter: 修改了传到页面中的Count后缀的数量
-  改为正确的数量，删掉fake过滤器即可
+  fake filter: 修改了传到页面中的Count后缀的数量
+  改为正确的数量，删掉fake过滤器即可
 ================================================================================
-#导航栏匹配域名显示和改变
+#导航栏匹配域名显示和改变
 app\helper\application_helper.rb
 # rewrite navigation 
 
 app\views\layouts\_base_header.html.erb
 # reset navigation by domain name and url through regular match
 ================================================================================
-#首页根据域名匹配进入不同的页面
+#首页根据域名匹配进入不同的页面
 app\controller\welcome_controller.rb
   def entry_select_user
     if request.original_url.match(/user\.trustie\.net/)

app/controllers/bids_controller.rb

@@ -881,6 +881,7 @@ class BidsController < ApplicationController
 
   def memberAccess
     # 是课程，则判断当前用户是否参加了课程
+    return true if current_user.admin?
     return 0 if @bid.courses.first.project_type == Project::ProjectType_project
     currentUser = User.current
     render_403 unless currentUser.member_of?(@bid.courses.first)

app/controllers/welcome_controller.rb

@@ -21,13 +21,7 @@ class WelcomeController < ApplicationController
   before_filter :entry_select_course, :entry_select_contest, :entry_select_user, :only => [:index]
  
   def index
-    projectActive       = Project.project_entities.active
-    @projectCount       = projectActive.count
-    @projectPublicCount = projectActive.all_public.count
-    @projectHidenCount  = @projectCount - @projectPublicCount
 
-    @developerCount     = User.developer.count
-    @allUsercount       = User.count
   end
 
   def robots
@@ -36,10 +30,7 @@ class WelcomeController < ApplicationController
   end
   
   def course
-    @courseCount = Project.course_entities.count
-    @teacherCount = User.teacher.count
-    @studentCount = User.student.count
-    @logoLink = logolink()
+    @logoLink ||= logolink()
   end
   
   
@@ -121,25 +112,25 @@ class WelcomeController < ApplicationController
     end
   end
 
-  def render(*args)
-    _fake if @fake_filter
-    super
-  end
+  # def render(*args)
+  #   _fake if @fake_filter
+  #   super
+  # end
 
-  private
+  # private
 
-  def fake
-    @fake_filter = true
-  end
+  # def fake
+  #   @fake_filter = true
+  # end
   
-  # 骗子方法
-  def _fake
-    instance_variables.map { |variable|
-      if variable.to_s =~ /Count$/
-        self.instance_variable_set(variable.to_sym,
-           ("1" + (self.instance_variable_get(variable.to_sym).to_s)).to_i)
-      end
-    }
-  end
+  # # 骗子方法
+  # def _fake
+  #   instance_variables.map { |variable|
+  #     if variable.to_s =~ /Count$/
+  #       self.instance_variable_set(variable.to_sym,
+  #          ("1" + (self.instance_variable_get(variable.to_sym).to_s)).to_i)
+  #     end
+  #   }
+  # end
 
 end

app/models/user.rb

@@ -199,6 +199,53 @@ class User < Principal
     end
   }
 
+
+  # ======================================================================
+  # 集中处理 User 扩展表为空的问题
+  validate :valid_user_extensions
+  before_save :save_user_extensions
+
+  def extensions
+    self.user_extensions ||= self.create_user_extensions
+  end
+
+  def respond_to?(m, include_private = false)
+    flag = extensions.respond_to? m.to_sym
+    if flag
+      flag
+    else
+      super
+    end
+  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.extensions.__send__ m.to_sym, *args
+      end
+      __send__ m.to_sym, *args, &block
+
+    else
+      super
+    end
+  end
+
+  def valid_user_extensions
+    if !self.extensions.valid?
+      self.extensions.errors.messages.each do |key, values|
+        values.each do |value|
+          self.errors.add key, value
+        end
+      end
+    end
+  end
+
+  def save_user_extensions
+    self.extensions.save
+  end
+  # 集中处理 User 扩展表为空的问题 < end
+  # ======================================================================
+
   #选择项目成员时显示的用户信息文字
   def userInfo
    info=self.nickname + '   (' + self.realname + ')';

app/views/my/account.html.erb

@@ -34,7 +34,6 @@
 
 <h3 style="padding-left: 10px;"><%= l(:label_my_account) %></h3>
 <%= error_messages_for 'user' %>
-<%= error_messages_for 'se' %>
 
 <fieldset class="box" style="margin:10px;">
 <fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">

app/views/tags/_tag_name.html.erb

@@ -51,14 +51,14 @@
 		  
 	    <% when '2' %>
 	    
-	     <% if (ProjectInfo.find_by_project_id(obj.id)).user_id == User.current.id %>
+	     <% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_id) == User.current.id %>
 	       <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
                                           :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 	     <% end %>
 	     
 	     <% when '3' %>
 	     
-	       <% if (ProjectInfo.find_by_project_id(obj.project_id)).user_id == User.current.id %>
+	       <% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_id) == User.current.id %>
 	       <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
                                           :taggable_id => obj.id, :taggable_type => object_flag %> </span>
 	     <% end %>

app/views/welcome/course.html.erb

@@ -259,17 +259,4 @@
 </div>
 <div class="clearfix"></div>
 
-<div class="hidden" style="width:100%;">
-  <div style="width:600px;margin:0px auto;margin-top:80px;">
-    <table style="width:600px;font-size:15px; color: #e8770d;">
-      <tr>
-        <td><strong>当前网站状态</strong></td>
-        <td>活跃课程: <%=@courseCount%></td>
-        <td>高校： 2个</td>
-        <td>教师： <%=@teacherCount%> 名</td>
-        <td>学生： <%=@studentCount%> 名<td>
-      </tr>
-    </table>
-  </div>
-</div>
 <%= render partial: 'link_to_another' %>

app/views/welcome/index.html.erb

@@ -137,16 +137,4 @@
 
 <div class="clearfix"></div>
 
-<div class="hidden" style="width:100%;">
-	<div style="width:600px;margin:0px auto;margin-top:180px;">
-	<table style="width:600px;font-size:15px; color: gray;">
-		<tr>
-			<td><strong>当前网站状态</strong></td>
-			<td>活跃项目：<%=@projectCount%>个</td>
-			<td>私有项目： <%=@projectHidenCount%>个</td>
-			<td>开发者：<%=@allUsercount%>个 </td>
-		</tr>
-	</table>
-	</div>
-</div>
 <%= render partial: 'link_to_another' %>