Merge branch 'develop' into cxt_course

app/api/mobile/apis/courses.rb

@@ -272,7 +272,7 @@ module Mobile
         params do
           requires :token,type:String
           requires :course_id,type:Integer,desc: '课程id'
-          optional :name,type:String,desc:'学生的姓名或者昵称或者学号可能包含的字符'
+          optional :name,type:String,desc:'学生的姓名或者登录名或者学号可能包含的字符'
         end
         get ":course_id/members" do
           cs = CoursesService.new

app/api/mobile/apis/users.rb

@@ -82,7 +82,7 @@ module Mobile
         desc "用户搜索"
         params do
           requires :name, type: String, desc: '用户名关键字'
-          requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱,3 昵称和姓名'
+          requires :search_by, type: String,desc: '搜索依据：0 登录名，1 用户名，2 邮箱,3 登录名和姓名'
           optional :is_search_assitant,type:Integer,desc:'是否搜索注册用户来作为助教'
           optional :course_id,type:Integer,desc: '课程id，搜索注册用户不为该课程教师的其他用户'
           optional :user_id,type:Integer,desc:'用户id'

app/controllers/admin_controller.rb

@@ -461,8 +461,8 @@ class AdminController < ApplicationController
     scope = User.order('last_login_on desc')
     scope = scope.where("last_login_on>= '#{params[:startdate]} 00:00:00'") if params[:startdate].present?
     scope =scope.where("last_login_on <= '#{params[:enddate]} 23:59:59'") if params[:enddate].present?
-    @user = scope
-    @user = paginateHelper @user,30
+    @users = scope
+    @users = paginateHelper @users,30
     @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html

app/controllers/application_controller.rb

@@ -312,7 +312,8 @@ class ApplicationController < ActionController::Base
     elsif @course
       allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @courses, :global => global)
     else
-      allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+      # allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project || @projects, :global => global)
+      allowed = true
     end
     allowed
   end

app/controllers/blog_comments_controller.rb

@@ -52,10 +52,14 @@ class BlogCommentsController < ApplicationController
       render_attachment_warning_if_needed(@article)
     else
     end
-    if params[:is_homepage]
-      redirect_to user_blogs_path(params[:user_id])
+    if params[:in_act]
+      redirect_to user_path(params[:user_id])
     else
-      redirect_to user_blog_blog_comment_path(:user_id=>params[:user_id],:blog_id=>params[:blog_id],:id=>params[:id])
+      if params[:is_homepage]
+        redirect_to user_blogs_path(params[:user_id])
+      else
+        redirect_to user_blog_blog_comment_path(:user_id=>params[:user_id],:blog_id=>params[:blog_id],:id=>params[:id])
+      end
     end
   end
   def destroy
@@ -123,6 +127,7 @@ class BlogCommentsController < ApplicationController
     @blogComment.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
     @article.children << @blogComment
     @article.save
+    # @article.update_attribute(:updated_on, @blogComment.updated_on)
     @user_activity_id = params[:user_activity_id]
     user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
     if user_activity

app/controllers/blogs_controller.rb

@@ -2,7 +2,6 @@ class BlogsController < ApplicationController
   before_filter :find_blog,:except => [:index,:create,:new,:set_homepage, :cancel_homepage]
   before_filter :find_user
   def index
-    @articls = @user.blog.articles
     @article = BlogComment.new
     respond_to do |format|
       format.html {render :layout=>'new_base_user'}

app/controllers/courses_controller.rb

@@ -509,7 +509,7 @@ class CoursesController < ApplicationController
     if @course
       respond_to do |format|
         flash[:notice] = l(:notice_successful_create)
-        format.html {redirect_to settings_course_url(@course, :course_type => 1)}
+        format.html {redirect_to course_url(@course)}
         format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'courses', :action => 'show', :id => @course.id) }
       end
     else

app/controllers/issues_controller.rb

@@ -81,6 +81,7 @@ class IssuesController < ApplicationController
       @priority_id = params[:priority_id]
       @status_id = params[:status_id]
       @subject = params[:subject]
+      @done_ratio = params[:done_ratio]
       @issue_count = @query.issue_count
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
       params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1
@@ -220,19 +221,27 @@ class IssuesController < ApplicationController
   end
 
   def update
-    return unless update_issue_from_params
-    @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
-    saved = false
-    begin
-      @saved = @issue.save_issue_with_child_records(params, @time_entry)
-    rescue ActiveRecord::StaleObjectError
-      @conflict = true
-      if params[:last_journal_id]
-        @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
-        @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+    if params[:issue_detail]
+      issue = Issue.find(params[:id])
+      issue = update_user_issue_detail(issue, params)
+      @saved = update_user_issue_detail(issue, params)
+      return
+    else
+      return unless update_issue_from_params
+      @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
+      saved = false
+      begin
+        @saved = @issue.save_issue_with_child_records(params, @time_entry)
+      rescue ActiveRecord::StaleObjectError
+        @conflict = true
+        if params[:last_journal_id]
+          @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
+          @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
+        end
       end
     end
 
+
     if @saved
       #修改界面增加跟踪者
       watcherlist = @issue.watcher_users
@@ -278,6 +287,19 @@ class IssuesController < ApplicationController
     end
   end
 
+  def update_user_issue_detail(issue, params)
+    case params[:type]
+    when "status"
+      issue.update_attribute(:status_id, params[:status_id])
+    when "assigned"
+      issue.update_attribute(:assigned_to_id, params[:assigned_to_id])
+    when "ratio"
+      issue.update_attribute(:done_ratio, params[:done_ratio])
+    when "prior"
+      issue.update_attribute(:priority_id, params[:priority_id])
+    end
+  end
+
   # Updates the issue form when changing the project, status or tracker
   # on issue creation/update
   def update_form

app/controllers/organizations_controller.rb

@@ -55,6 +55,7 @@ class OrganizationsController < ApplicationController
     @organization.name = params[:organization][:name]
     @organization.description = params[:organization][:description]
     @organization.is_public = params[:organization][:is_public]
+    @organization.allow_guest_download = params[:organization][:allow_guest_download] == '1' ? 1 : 0
     @organization.creator_id = User.current.id
     member = OrgMember.new(:user_id => User.current.id)
 

app/controllers/repositories_controller.rb

@@ -360,6 +360,9 @@ update
       end
       # end
       @changesets_latest_coimmit = @changesets[0]
+      unless @changesets[0].blank?
+        update_commits_date(@project, @changesets_latest_coimmit)
+      end
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories
       @course_tag = params[:course]
@@ -589,6 +592,11 @@ update
     project.project_score.update_attribute(:changeset_num, count)
   end
 
+  # 更新项目提交次数时间
+  def update_commits_date project, date
+    project.project_score.update_attribute(:commit_time, date.created_at)
+  end
+
   def find_repository
     @repository = Repository.find(params[:id])
     @project = @repository.project

app/controllers/users_controller.rb

@@ -93,6 +93,11 @@ class UsersController < ApplicationController
     end
   end
 
+  # 更新issue状态
+  def user_act_issue_assign_to
+
+  end
+
   # 用户消息
   # 说明： homework 发布作业；message：讨论区； news：新闻； poll：问卷；works_reviewers：作品评阅；works_reply:作品回复,exercise:课程测验
   # issue：问题；journal：缺陷状态更新； forum：公共贴吧: user_feedback: 用户留言; new_reply:新闻回复（comment）
@@ -1791,13 +1796,24 @@ class UsersController < ApplicationController
   def share_news_to_project
     news = News.find(params[:send_id])
     project_ids = params[:project_ids]
+    # project_ids.each do |project_id|
+    #   if Project.find(project_id).news.map(&:id).exclude?(news.id)
+    #     project_news = News.create(:project_id => project_id.to_i, :title => news.title, :summary => news.summary, :description => news.description,:author_id => User.current.id, :created_on => Time.now)
+    #     news.attachments.each do |attach|
+    #       project_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+    #                                              :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+    #                                              :is_public => attach.is_public,  :quotes => 0)
+    #     end
+    #   end
+    # end
     project_ids.each do |project_id|
-      if Project.find(project_id).news.map(&:id).exclude?(news.id)
-        project_news = News.create(:project_id => project_id.to_i, :title => news.title, :summary => news.summary, :description => news.description,:author_id => User.current.id, :created_on => Time.now)
+      project = Project.find(project_id)
+      if project.news.map(&:id).exclude?(news.id)
+        message = Message.create(:board_id => project.boards.first.id, :subject => news.title, :content => news.description, :author_id => User.current.id)
         news.attachments.each do |attach|
-          project_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
-                                                 :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
-                                                 :is_public => attach.is_public,  :quotes => 0)
+          message.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+                                                     :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                                     :is_public => attach.is_public,  :quotes => 0)
         end
       end
     end

app/helpers/application_helper.rb

@@ -49,6 +49,21 @@ module ApplicationHelper
     end
   end
 
+  def link_to_user_version(version, options = {})
+    return '' unless version && version.is_a?(Version)
+    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => " f16 fb c_dblue "
+  end
+
+  # 判断课程是否为精品课程
+  def is_excellent_course course
+    (course.is_excellent? or course.excellent_option?) ? true : false
+  end
+
+  # 判断课程对成员是否可见
+  def visible_course?(course)
+    (course.is_delete? or (!course.is_public? && !User.current.member_of_course?(course))) ? false : true
+  end
+
   # 获取项目/课程总分
   # 发布缺陷 4分 回复缺陷 1分 提交一次 4分 讨论帖子 2分 回复帖子 1分 发布新闻 1分
   def static_project_score obj
@@ -959,7 +974,17 @@ module ApplicationHelper
     first_page = FirstPage.find_by_page_type('project')
     if args.empty?
       title = @html_title || []
-      title << @project.name if @project
+      if @project
+        title << @project.name
+      elsif @course
+        title << @course.name
+      elsif @organization
+        title << @organization.name
+      elsif @user
+        title << @user.login
+      else
+        title << User.current.login
+      end
       if first_page.nil? || first_page.web_title.nil?
         title << Setting.app_title unless Setting.app_title == title.last
       else

app/helpers/courses_helper.rb

@@ -11,6 +11,59 @@ module CoursesHelper
   #StudentRoles = [5, 10]
   #AllPeople = StudentRoles+TeacherRoles
   ## return people count
+
+
+  # 推荐的精品课程
+  def excellent_course_recommend new_course
+    q = "%#{new_course.name.strip}%"
+    result = find_excelletn_course(q, new_course)
+  end
+
+  # 查询符合条件的精品课程
+  # 用新课程名去匹配精品课程中按课程名和Tag名
+  def find_excelletn_course keywords, current_course
+    # 获取tag匹配结果ID
+    a_tags = []
+    # kc = keywords.to_a
+    Course.visible.where("is_excellent =?", 1).each do |ec|
+      if ec.tags.any?{|value| current_course.name.include?(value.to_s)}
+        a_tags << ec.id
+      end
+    end
+    # sql = "SELECT distinct c.* FROM `courses` c, tags t, taggings ts where t.id = ts.tag_id and ts.taggable_id = c.id  and c.is_excellent = 1 and is_delete = 0 and
+    #       ts.taggable_type = 'Course' and t.name like '%#{keywords}%'"
+    # a_tags = Course.find_by_sql(sql).select{|course| course.is_public ==1 unless User.current.member_of_course?(course)}
+    # 通过elastic结果获取精品课程
+    a_courses = []
+    #courses = Course.search(keywords)
+    #courses.each do |c|
+    #  a_courses << c.id
+    #end
+    a_courses << a_tags unless a_tags.length == 0
+    # 课程本身不能搜索显示自己
+    excellent_ids = a_courses.flatten.uniq.delete_if{|i| i == current_course.id}
+    limit = 5 - excellent_ids.length.to_i
+    sql = "SELECT distinct c.id FROM course_activities cs, courses c where cs.course_id = c.id
+         and c.is_excellent =1 and c.id != #{current_course.id} order by cs.updated_at desc;"
+    default_ecourse_ids = Course.find_by_sql(sql).flatten
+    # REDO:时间紧，待优化
+    default_ids =[]
+    default_ecourse_ids.each do |de|
+      default_ids << de.id
+    end
+    default_ids = default_ids - excellent_ids
+    #default_ecourse = Course.where("id is not in (?)", ids).find_by_sql(sql).flatten.delete_if{|i| i == current_course.id}.flatten
+    arr_result = excellent_ids << default_ids
+    arr_result = arr_result.flatten.first(5)
+    return arr_result
+    # 过滤条件：精品课程、本身不在搜索范围
+    #e_courses = Course.where("is_excellent =? and id in (?)",1, arr_result).where("id !=?", current_course.id)
+  end
+
+  # 判断精品课程是否可见，非课程成员无法查看私有课程
+  def visible_excellent_course obj
+    # if course.is_pu
+  end
   
   # 返回x项目成员数量，即roles表中定义的所有成员
   def projectCount project    

app/models/blog_comment.rb

@@ -18,6 +18,7 @@ class BlogComment < ActiveRecord::Base
 
   after_save :add_user_activity
   after_update :update_activity
+  after_create :update_parent_time
   before_destroy :destroy_user_activity
 
   scope :like, lambda {|arg|
@@ -64,6 +65,11 @@ class BlogComment < ActiveRecord::Base
     (user && user.logged? && (self.author == user) ) || user.admin?
   end
 
+  def update_parent_time
+    if !self.parent.nil?
+      self.root.update_attribute(:updated_on, self.updated_on)
+    end
+  end
   def project
   end
 end

app/models/course.rb

@@ -144,6 +144,26 @@ class Course < ActiveRecord::Base
     )
   end
 
+  def self.e_search(query)
+    __elasticsearch__.search(
+        {
+            query: {
+                multi_match: {
+                    query: query,
+                    type:"most_fields",
+                    operator: "or",
+                    fields: ['name', 'description^0.5']
+                }
+            },
+            sort: {
+                _score:{order: "desc" },
+                updated_at:{order:"desc"}
+
+            }
+        }
+    )
+  end
+
   def visible?(user=User.current)
     user.allowed_to?(:view_course, self)
   end
@@ -383,6 +403,7 @@ class Course < ActiveRecord::Base
   def act_as_course_message
     self.course_messages << CourseMessage.new(:user_id => self.tea_id, :course_id => self.id, :viewed => false)
   end
+
   #项目与课程分离后，很多课程的名称等信息为空，这些数据信息存储在项目表中！！就是数据兼容的问题
   #def name
   #  read_attribute('name') || Project.find_by_identifier(self.extra).try(:name)
@@ -404,6 +425,7 @@ class Course < ActiveRecord::Base
       self.__elasticsearch__.index_document
     end
   end
+
   def update_course_ealasticsearch_index
     if self.is_public == 1 and self.is_delete == 0 #如果是初次更新成为公开或者恢复被删除的情况，会报错，那么这条记录尚未被索引过。没有报错就是更新的其他属性
       begin
@@ -427,8 +449,12 @@ class Course < ActiveRecord::Base
 
     end
   end
+
+
 end
 
+
+
 # Delete the previous articles index in Elasticsearch
 # Course.__elasticsearch__.client.indices.delete index: Course.index_name rescue nil
 #

app/models/course_activity.rb

@@ -6,6 +6,7 @@ class CourseActivity < ActiveRecord::Base
   belongs_to :user
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
   after_save :add_user_activity, :add_course_activity
+  after_create :add_course_lead
   before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
@@ -60,4 +61,18 @@ class CourseActivity < ActiveRecord::Base
     org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'")
     org_activity.destroy_all
   end
+
+  # 发布新课导语
+  # 导语要放置在课程创建信息之后
+  # 导语
+  def add_course_lead
+    if self.course_act_type == "Course"
+      name = Redmine::Configuration['course_message_lead_subject']
+      content = Redmine::Configuration['course_message_lead_content']
+      # message的status状态为0为正常，为1表示创建课程时发送的message
+      message = Message.create(:subject => name, :content => content, :board_id => self.course.boards.first.id, :author_id => self.course.tea_id , :sticky => true, :status => true )
+      # 更新的目的是为了排序，因为该条动态的时间可能与课程创建的动态创建时间一直
+      message.course_acts.first.update_attribute(:updated_at, message.course_acts.first.updated_at + 1)
+    end
+  end
 end

app/models/mailer.rb

@@ -380,8 +380,16 @@ class Mailer < ActionMailer::Base
   end
 
   # issue截止时间提醒
-  def issue_due_date(issue, recipients)
-    @author = issue.author.login
+  def issue_due_date(issue)
+    recipients ||= []
+    if issue.author.id != issue.assigned_to_id
+      recipients << issue.author.mail
+    end
+
+    # 被指派人邮箱地址加入数组
+    recipients << issue.assigned_to.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+    @author = issue.author
     @issue_name = issue.subject
     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
     @subject = "#{l(:mail_issue)}#{issue.subject} #{l(:mail_issue_due_date)} "

app/models/user.rb

@@ -825,6 +825,9 @@ class User < Principal
   end
 
   def admin_of_org?(org)
+    if self.admin?
+      return true
+    end
     if  OrgMember.where("user_id =? and organization_id =?", self.id, org.id).count == 0
       return false
     end

app/views/account/login.html.erb

@@ -224,7 +224,7 @@
           <%= back_url_hidden_field_tag %>
           <div class="mb20">
             <%= text_field_tag 'username', params[:username], :tabindex => '1' ,
-                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或昵称', :onkeypress => "user_name_keypress(event);"%>
+                               :class=>'loginSignBox',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
             <!--<input type="text" placeholder="请输入邮箱地址或昵称" class="loginSignBox" />-->
           </div>
           <% if Setting.openid? %>
@@ -283,8 +283,8 @@
           </div>
           <div  class="loginSignRow">
             <!--<input type="text" placeholder="请输入用户昵称" class="loginSignBox" />-->
-            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
-            <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
+            <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户登录名",:class=>'loginSignBox'%>
+            <div class="loginSignAlert" id="login_req" style="display: none">用户登录名为2-18个中英文，数字或下划线</div>
           </div>
               <div class="loginSignOption">
                 <div class="fl mt3 mr5">

app/views/admin/latest_login_users.html.erb

@@ -38,7 +38,7 @@
         用户姓名
       </th>
       <th style="width: 50px;">
-        用户昵称
+        用户登录名
       </th>
       <th style="width: 50px;">
         用户身份
@@ -47,7 +47,7 @@
     </thead>
     <tbody>
         <% @count=@page * 30 %>
-        <% for user in @user do %>
+        <% for user in @users do %>
             <tr>
               <% @count +=1 %>
               <td align="center">

app/views/attachments/_form.html.erb

@@ -31,7 +31,7 @@
   <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-    <%= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
+    <%= button_tag "上传附件", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
                        :class => 'file_selector',

app/views/attachments/_form_project.html.erb

@@ -109,7 +109,7 @@
     <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
       <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-      <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+      <%= button_tag "上传附件", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
       <%= file_field_tag 'attachments[dummy][file]',
                          :id => '_file',
                          :class => 'file_selector',

app/views/blog_comments/edit.html.erb

@@ -1,5 +1,5 @@
 <% if User.current.logged? && User.current.id == @user.id %>
-    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage]},:method=>'PUT',
+    <%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage],:in_act => params[:in_act]},:method=>'PUT',
                           :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
         <%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
     <% end %>

app/views/blog_comments/show.html.erb

@@ -45,7 +45,7 @@
                   <li>
                     <%= link_to(
                                 l(:button_edit),
-                                {:action => 'edit', :id => @article.id},
+                                {:action => 'edit', :id => @article.id,:in_act => params[:in_act]},
                                 :class => 'postOptionLink'
                         ) if User.current && User.current.id == @article.author.id %>
                   </li>
@@ -215,4 +215,4 @@
       postContent = postContent.replace(/&nbsp;/g," ");
       $("#message_description_<%= @article.id %>").html(postContent);
   });
-</script>
+</script>

app/views/blogs/index.html.erb

@@ -30,7 +30,7 @@
 <%= import_ke(enable_at: false, prettify: false) %>
 
 
-<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.created_on desc"), :page => 0, :user => @user} %>
+<%= render :partial => 'blogs/article_list', :locals => {:blog=>@user.blog,:topics => @user.blog.articles.reorder("#{BlogComment.table_name}.sticky desc,#{BlogComment.table_name}.updated_on desc"), :page => 0, :user => @user} %>
 
 
 <script type="text/javascript">//侧导航