Merge branch 'develop' into cxt_course

.gitignore

@@ -7,6 +7,7 @@
 /config/configuration.yml
 /config/additional_environment.rb
 /config/oneapm.yml
+/config/environments/production.rb
 
 
 /files/*

app/api/mobile/apis/activities.rb

@@ -36,7 +36,7 @@ module Mobile
             principal_types = "JournalsForMessage"
             watched_user_ids = User.watched_by(user.id).count == 0 ? " " : ("," + User.watched_by(user.id).map{|u| u.id.to_s }.join(','))
             user_ids = "(" + user.id.to_s + watched_user_ids + ")"
-            watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").count == 0 ? " " :Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
+            watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").count == 0 ? "-1" :Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
             blog_ids = "(" + watched_user_blog_ids + ")"
 
             if container_type == "Course"

app/api/mobile/apis/newss.rb

@@ -35,6 +35,8 @@ module Mobile
             present :is_public, is_public
             present :status, 0
           rescue Exception=>e
+            Rails.logger.info "course_notice is not find!"
+            Rails.logger.info e
             present :status, -1
             present :message, e.message
           end

app/api/mobile/entities/activity.rb

@@ -73,6 +73,12 @@ module Mobile
                   elsif ac.container_type == "Blog"
                     "发表博客"
                   end
+                when :syllabus_title
+                  if ac.container_type == "Course"
+                    course = get_course(ac.container_id)
+                    name = course.syllabus.nil? ? "":course.syllabus.title
+                    name
+                  end
                 when :course_project_id
                   if ac.container_type == "Course"
                     ac.container_id
@@ -145,6 +151,7 @@ module Mobile
       act_expose :latest_update #最新更新时间
       act_expose :course_project_id    #课程/项目ID
       act_expose :course_project_name    #课程/项目名字
+      act_expose :syllabus_title    #课程名字
       act_expose :activity_type_name     #课程问答区/项目缺陷等
       expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
         if instance.act_type == "HomeworkCommon" || instance.act_type == "News" || instance.act_type == "Message" || instance.act_type == "BlogComment" || instance.act_type == "JournalsForMessage" || instance.act_type == "Issue"

app/api/mobile/entities/course.rb

@@ -107,6 +107,7 @@ module Mobile
       course_expose :current_user_is_member
       course_expose :current_user_is_teacher
       course_expose :work_unit
+      course_expose :syllabus_title
     end
   end
 end

app/controllers/courses_controller.rb

@@ -894,12 +894,15 @@ class CoursesController < ApplicationController
     #   return
     # end
     #更新创建课程消息状态
-    create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
-    create_course_messages.update_all(:viewed => true)
+    course_request_messages = CourseMessage.where(:user_id => User.current.id, :course_id => @course.id, :course_message_type => ["CourseRequestDealResult", "Course"], :viewed => false)
+    course_request_messages.update_all(:viewed => true)
+
+    # create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
+    # create_course_messages.update_all(:viewed => true)
 
     #更新申请结果反馈消息的状态
-    course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
-    course_request_messages.update_all(:viewed => true)
+    # course_request_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @course.id,  'CourseRequestDealResult', false)
+    # course_request_messages.update_all(:viewed => true)
 
     course_activities = @course.course_activities
     @canShowRealName = User.current.member_of_course? @course

app/controllers/messages_controller.rb

@@ -92,7 +92,13 @@ class MessagesController < ApplicationController
       @message.board = @board
       @message.safe_attributes = params[:message]
       if request.post?
-        @message.save_attachments(params[:attachments])
+        if @project
+          is_public = @project.is_public
+        elsif @course
+          is_public = @course.is_public
+        end
+        # 公开项目/课程上传的资源是公开的，私有项目上传的是私有的
+        @message.save_attachments_containers(params[:attachments], User.current, is_public)
         if @message.save
           # 更新kindeditor上传的图片资源所有者
           if params[:asset_id]

app/controllers/news_controller.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -212,6 +213,19 @@ class NewsController < ApplicationController
       @news.safe_attributes = params[:news]
       @news.save_attachments(params[:attachments])
       if @news.save
+        @course.members.each do |m|
+          if m.user_id != User.current.id
+            #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+            count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{@news.course_id}").count
+            if count == 0
+              ws = WechatService.new
+              content = @news.title
+              name = @news.course.syllabus.nil? ? @news.course.name : @news.course.syllabus.title+" • "+@news.course.name
+              ws.class_notice m.user_id, "course_notice", @news.id, "#{l(:label_new_notice_template)}", name, @news.author.show_name, format_time(@news.created_on), content, "点击查看通知详情"
+            end
+          end
+        end
+
         if params[:asset_id]
           ids = params[:asset_id].split(',')
           update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS

app/controllers/projects_controller.rb

@@ -325,27 +325,27 @@ class ProjectsController < ApplicationController
     end
 
     # 版本库统计图
-    unless @project.gpid.nil? || @project.project_score.changeset_num == 0
-      # rep_statics_commit = @project.rep_statics.order("commits_num desc")
-      rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")
-      rep_statics_code = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by changeset desc limit 10")
-      # rep_statics_code = @project.rep_statics.sort_by {|u| u.changeset}.reverse
-      @a_uname = rep_statics_commit.map {|s| s.uname }
-      @a_uname_code = rep_statics_code.map {|s| s.uname }
-      @a_commits_num = rep_statics_commit.map {|s| s.commits_num.to_i }
-      @a_commits_add = rep_statics_code.map {|s| s.add.to_i }
-      @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
-      @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
-      g = Gitlab.client
-      begin
-        gid = @project.gpid
-        g_project = g.project(gid)
-        g_branch = g_project.default_branch.to_s
-      rescue =>e
-        logger.error("get default branch failed: " + e)
-      end
-      @rev = g_branch.nil? ? "master" : g_branch
-    end
+    # unless @project.gpid.nil? || @project.project_score.changeset_num == 0
+    #   # rep_statics_commit = @project.rep_statics.order("commits_num desc")
+    #   rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")
+    #   rep_statics_code = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by changeset desc limit 10")
+    #   # rep_statics_code = @project.rep_statics.sort_by {|u| u.changeset}.reverse
+    #   @a_uname = rep_statics_commit.map {|s| s.uname }
+    #   @a_uname_code = rep_statics_code.map {|s| s.uname }
+    #   @a_commits_num = rep_statics_commit.map {|s| s.commits_num.to_i }
+    #   @a_commits_add = rep_statics_code.map {|s| s.add.to_i }
+    #   @a_commits_del = rep_statics_code.map {|s| s.del.to_i }
+    #   @a_commits_changeset = rep_statics_code.map {|s| s.changeset.to_i }
+    #   g = Gitlab.client
+    #   begin
+    #     gid = @project.gpid
+    #     g_project = g.project(gid)
+    #     g_branch = g_project.default_branch.to_s
+    #   rescue =>e
+    #     logger.error("get default branch failed: " + e)
+    #   end
+    #   @rev = g_branch.nil? ? "master" : g_branch
+    # end
     # 根据对应的请求，返回对应的数据
     respond_to do |format|
       format.html

app/controllers/student_work_controller.rb

@@ -338,41 +338,17 @@ class StudentWorkController < ApplicationController
   end
 
   def index
-    # 作业消息状态更新
-    @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id && homework_message.viewed == 0
-        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
-      end
-    end
-
-    #修改作品提示消息更新
-    student_work_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, StudentWork.name, 0)
-    student_work_messages.each do |message|
-      message.update_attribute(:viewed, true)
-    end
-
+    # 作业消息状态更新?
+    homeworkcommon_messages = CourseMessage.where(:user_id => User.current.id, :viewed => 0, :course_message_id => @homework.id, :course_message_type => "HomeWorkCommon")
+    homeworkcommon_messages.update_all(:viewed => true)
+    studentwork_messages = CourseMessage.where(:user_id => User.current.id, :viewed => 0, :course_id => @homework.course, :course_message_type => "StudentWork")
+    studentwork_messages.update_all(:viewed => true)
     # 作品打分消息状态更新
     studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
-    studentworks_scores.each do |studentworks_score|
-      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
-    end
+    studentworks_scores.update_all(:viewed => true)
     # 作品评论消息状态更新
     journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
-    journals_for_teacher.each do |journal_for_teacher|
-      journal_for_teacher.update_attributes(:viewed => true)
-    end
-    #不能参与作业匿评消息状态更新
-    no_evaluation = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =? and status =?", User.current.id, @homework.course, "StudentWork", 0, 0)
-    no_evaluation.update_all(:viewed => true)
-    # 作品留言
-    # 消息end
-    #设置作业对应的forge_messages表的viewed字段
-    query_student_work = @homework.course_messages
-    query_student_work.each do |query|
-      if User.current.id == query.user_id
-        query.update_attributes(:viewed => true)
-      end
-    end
+    journals_for_teacher.update_all(:viewed => true)
     ##################################################################################################################
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name].to_s.strip || "",params[:group]
     @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).order("created_at desc")
@@ -480,7 +456,7 @@ class StudentWorkController < ApplicationController
         elsif @order == 'student_id'
           @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").joins("join user_extensions on student_works.user_id = user_extensions.user_id").order("#{@order} #{@b_sort}"),@name
         else
-          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.no_copy.select("student_works.*,student_works.work_score as score").includes(:user => {:user_extensions => []}, :project => {}, :student_works_scores => {}).order("#{@order} #{@b_sort}"),@name
         end
         @show_all = true
       elsif User.current.member_of_course?(@course)

app/controllers/users_controller.rb

@@ -1683,7 +1683,7 @@ class UsersController < ApplicationController
           container_type = 'Project'
           act_type = 'Issue'
         when "project_message"
-          container_type = 'Course'
+          container_type = 'Project'
           act_type = 'Message'
         when "user_journals"
           container_type = 'Principal'

app/controllers/wechats_controller.rb

@@ -8,13 +8,13 @@ class WechatsController < ActionController::Base
   # default text responder when no other match
   on :text do |request, content|
       #邀请码
-    if join_class_request(request)
-      sendBindClass(request, {invite_code: content})
-    elsif join_project_request(request)
-      sendBindProject(request, {invite_code: content})
-    else
+    # if join_class_request(request)
+    #   sendBindClass(request, {invite_code: content})
+    # elsif join_project_request(request)
+    #   sendBindProject(request, {invite_code: content})
+    # else
       request.reply.text "您的意见已收到，非常感谢~ \n更多问题可以通过以下方式联系我们：\n官方QQ群：173184401\n我们会认真聆听您的意见和建议。"
-    end
+    # end
   end
 
   # When receive 'help', will trigger this responder
@@ -456,10 +456,20 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
-          # if params[:state].match("review_class_member") || params[:state].match("review_project_member")
+          if !(params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
+            uw = user_binded?(open_id)
+            if uw
+              user = uw.user
+              lastname = user.lastname
+            end
+          end
+
+          if lastname && lastname == ""
+            @path = '/edit_userinfo'
+          else
             @path = params[:state].split('/')[0]
             useridstr = params[:state].split('/')[1]
-          # end
+
             if useridstr
               redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&#{useridstr}" and return
             elsif params[:id]
@@ -470,6 +480,7 @@ class WechatsController < ActionController::Base
             # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
           end
         end
+      end
       render 'wechats/user_activities', layout: nil
     end
 

app/helpers/application_helper.rb

@@ -345,7 +345,11 @@ module ApplicationHelper
 
   def link_to_isuue_user(user, options={})
     if user.is_a?(User)
+      if options[:format]
         name = h(user.name(options[:format]))
+      else
+        name = h(user.show_name)
+    end
       link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => "pro_info_p"
     else
       h(user.to_s)
@@ -921,6 +925,12 @@ module ApplicationHelper
     s.html_safe
   end
 
+  # 计算Pull Request的请求数目
+  def pull_request_count project
+    g = Gitlab.client
+    g.merge_requests(project.gpid).count
+  end
+
   #项目成员列表复选框生成
   def project_member_check_box_tags_ex name, principals
     s = ''
@@ -978,7 +988,7 @@ module ApplicationHelper
     groups = ''
     collection.sort.each do |element|
       selected_attribute = ' selected="selected"' if option_value_selected?(element, selected)
-      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
+      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.show_name}</option>)
     end
     unless groups.empty?
       s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)

app/helpers/courses_helper.rb

@@ -63,6 +63,7 @@ module CoursesHelper
     # searchTeacherAndAssistant(project).count
   end
 
+  # 统计数目
   def show_nav?(count)
     count == 0 ? true : false
   end
@@ -795,11 +796,12 @@ module CoursesHelper
     link.html_safe
   end
 
+  # 可以查看到资源库的资源
   def visable_attachemnts_incourse course
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if (attachment.is_public? && attachment.is_publish == 1) ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,course)|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
+      if attachment.is_public? && attachment.is_publish == 1 || User.current == attachment.author || User.current.allowed_to?(:as_teacher,course) || (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end

app/helpers/issues_helper.rb

@@ -111,9 +111,9 @@ module IssuesHelper
 
   def principals_options_for_isuue_list(project)
     if User.current.member_of?(project)
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c|  [User.find(c.user_id).show_name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
     else
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c| [User.find(c.user_id).show_name, c.user_id]}.unshift(["指派给", 0])
     end
   end
 

app/models/at_message.rb

@@ -99,7 +99,7 @@ class AtMessage < ActiveRecord::Base
         else
           type = "journal_for_message"
           detail_id = topic.id
-          detail_title = at_message.notes
+          detail_title = topic.notes.nil? ? "" : topic.notes
         end
       else
         status = -1

app/models/homework_common.rb

@@ -77,7 +77,8 @@ class HomeworkCommon < ActiveRecord::Base
           count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
           if count == 0
             ws = WechatService.new
-            ws.homework_message_notice(m.user_id, "homework", self.id, "#{m.user.show_name}，#{l(:label_new_homework_template)}", self.course.name, "新作业："+ self.name.html_safe, "作业内容请点击“详情”查看。")
+            name = self.course.syllabus.nil? ? self.course.name : self.course.syllabus.title+" • "+self.course.name
+            ws.homework_message_notice(m.user_id, "homework", self.id, "#{m.user.show_name}，#{l(:label_new_homework_template)}", name, "新作业："+ self.name.html_safe, "作业内容请点击“详情”查看。")
           end
           # end
         end

app/models/news.rb

@@ -62,7 +62,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message, :delay_news_send
+  after_create :act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score, :act_as_system_message, :delay_news_send
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
@@ -140,19 +140,13 @@ class News < ActiveRecord::Base
     Watcher.create(:watchable => self, :user => author)
   end
 
-  ## fq
-  def act_as_activity
-    self.acts << Activity.new(:user_id => self.author_id)
-  end
-
   # Time 2015-02-27 15:48:17
   # Author lizanle
   # Description 公用表中也要记录
   def act_as_forge_activity
     # 如果是project为空，那么是课程相关的，不需要保存
     if self.project
-      self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
-                                             :project_id => self.project.id)
+      self.forge_acts << ForgeActivity.new(:user_id => self.author_id, :project_id => self.project.id)
     end
   end
 
@@ -167,17 +161,17 @@ class News < ActiveRecord::Base
   # 消息发送原则：除了消息的发布者，课程的其它成员都能收到消息提醒
   def act_as_system_message
     if self.course
-      self.course.members.each do |m|
-        if m.user_id != self.author_id
-          #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-          count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
-          if count == 0
-            ws = WechatService.new
-            content = self.title
-            ws.class_notice m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.course.name, self.author.show_name, format_time(self.created_on), content, "点击查看通知详情"
-          end
-        end
-      end
+      # self.course.members.each do |m|
+      #   if m.user_id != self.author_id
+      #     #self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
+      #     count = ShieldWechatMessage.where("container_type='User' and container_id=#{m.user_id} and shield_type='Course' and shield_id=#{self.course_id}").count
+      #     if count == 0
+      #       ws = WechatService.new
+      #       content = self.title
+      #       ws.class_notice m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.course.name, self.author.show_name, format_time(self.created_on), content, "点击查看通知详情"
+      #     end
+      #   end
+      # end
     else
       if !self.project.nil?
         self.project.members.each do |m|
@@ -198,7 +192,7 @@ class News < ActiveRecord::Base
   def contain_news_message
     self.course.members.each do |m|
       if m.user_id != self.author_id
-        self.course_messages << CourseMessage.new(:user_id => user_id, :course_id => container_id, :viewed => false)
+        self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
       end
     end
   end

app/services/courses_service.rb

@@ -332,7 +332,7 @@ class CoursesService
     # unless (course.is_public == 1 ||  current_user.member_of_course?(course) || current_user.admin?)
     #   raise '403'
     # end
-    {:course => course,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.nil? ? false : current_user.member_of_course?(course),:current_user_is_teacher => current_user.nil? ? false : is_course_teacher(current_user,course),:course_student_num => course ? course.student.count.to_s : 0}
+    {:course => course,:syllabus_title => course.syllabus.nil? ? "":course.syllabus.title ,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.nil? ? false : current_user.member_of_course?(course),:current_user_is_teacher => current_user.nil? ? false : is_course_teacher(current_user,course),:course_student_num => course ? course.student.count.to_s : 0}
   end
 
   #创建课程
@@ -554,8 +554,10 @@ class CoursesService
         uid = user.id
         type = "review_class_member"
       end
+
+      name = course.syllabus.nil? ? course.name : course.syllabus.title+" • "+course.name
       ws = WechatService.new
-      ws.class_notice user.id, type, course.id, title, course.name, user.show_name, format_time(Time.now), content, remark,uid
+      ws.class_notice user.id, type, course.id, title,name, user.show_name, format_time(Time.now), content, remark,uid
 
     end
   end
@@ -650,8 +652,9 @@ class CoursesService
 
                     rolename = role_ids.include?("7") ? "助教" : "教师"
                     content = current_user.show_name + "申请以"+rolename+"身份加入班级，等待您的审批。"
+                    name = course.syllabus.nil? ? course.name : course.syllabus.title+" • "+course.name
                     ws = WechatService.new
-                    ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", course.name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id
+                    ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id
                   end
                 end
                 #--------------------------------------------

app/services/syllabuses_service.rb

@@ -69,7 +69,8 @@ class SyllabusesService
     if count == 0
       ws = WechatService.new
       title = "恭喜您创建班级成功。"
-      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 1, "点击查看班级详情。"
+      name = course.syllabus.nil? ? course.name : course.syllabus.title+" • "+course.name
+      ws.create_class_notice user.id, "create_course_notice", course.id,title, name, user.show_name, 1, "点击查看班级详情。"
     end
   end
 

app/views/attachments/_activity_attach.html.erb

@@ -9,8 +9,9 @@
           <span class="postAttSize">(
             <%= number_to_human_size attachment.filesize %>)
           </span>
-          <span class="author" title="<%= attachment.author%>">
-            <%= link_to h(truncate(attachment.author.name, length: 15, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+          <% user_name = attachment.author.show_name.empty? ? attachment.author : attachment.author.show_name %>
+          <span class="author" title="<%= user_name %>">
+            <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "linkBlue2" %>,
             <%= format_time(attachment.created_on) %>
           </span>
         </div>

app/views/attachments/_project_file_links.html.erb

@@ -91,8 +91,8 @@
            
       <% end %>
       <% if options[:author] %>
-    <span class="author" title="<%= attachment.author%>">
-      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
+    <span class="author" title="<%= attachment.author.show_name%>">
+      <%= link_to h(truncate(attachment.author.show_name, length: 10, omission: '...')),user_path(attachment.author),:class => "link-blue" %>,
       <%= format_time(attachment.created_on) %>
     </span>
       <% end %>

app/views/forums/_forum_list.html.erb

@@ -11,7 +11,8 @@
                 <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
               <div class="postDes"><%= textAreailizable forum.description%></div>
-              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
+              <% user_name = forum.creator.show_name.empty? ? forum.creator.name : forum.creator.show_name %>
+              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= user_name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>
             <div class="postStatics">

app/views/forums/_show_topics.html.erb

@@ -27,7 +27,7 @@
               </div>
               <% author = topic.last_reply.try(:author)%>
               <% if author%>
-                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
+                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.show_name%></a></div>
                   <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
               <% end%>
               <span class=" fr " style="color: #888888; font-size: 12px;">更新时间：<%= format_date(topic.updated_at)%></span>

app/views/issues/_detail.html.erb

@@ -20,7 +20,7 @@
       <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span></p>
     <br>
     <div class="cl"></div>
-    由<%=link_to @issue.author, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
+    由<%=link_to @issue.author.show_name, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
   </div>
 
   <!--talk_txt end-->

app/views/issues/_edit.html.erb

@@ -3,7 +3,7 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 
-<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true, :remote => true} do |f| %>
+<%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
     <!--编辑的整个属性-->

app/views/issues/_jounal_refresh.js.erb

@@ -1,3 +1,8 @@
+/* $("#reply_div_<%#= @issue.id %>").html("<%#=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue}) %>");
+$("#issue_detail_show").html('<%#= escape_javascript(render :partial => 'issues/detail') %>');
+$("#issue_edit_show").html('<%#= escape_javascript(render :partial => 'issues/edit') %>');
+$("#div_issue_attachment_<%#=@issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/issue_attachments', :locals => {:issue => @issue}) %>");
+sd_create_editor_from_data(<%#= @issue.id %>, null, "100%", "<%#= @issue.class.name %>");*/
 
 location.reload();
 issue_desc_editor = KindEditor.create('#issue_description',
@@ -14,3 +19,5 @@ issue_desc_editor = KindEditor.create('#issue_description',
             "uploadJson":"/kindeditor/upload",
             "fileManagerJson":"/kindeditor/filemanager"});
 //    $("#issue_test_<%#= @issue.id %>").html("<%#= escape_javascript(render :partial => 'issues/edit', :locals => {:issue => Issue.find( @issue_id)}) %>");
+// $(".homepagePostReplyBannerCount").html('<%#= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
+// sd_create_editor_from_data(<%#= @issue.id%>, null, "100%","<%#= @issue.class.name %>");

app/views/issues/update.js.erb

@@ -1,4 +1,13 @@
 <% if @saved %>
+/*$("#issue_detail").replaceWith('<%#= escape_javascript(render :partial => 'issues/detail') %>');
+$("#issue_edit").replaceWith('<%#= escape_javascript(render :partial => 'issues/edit') %>');
+
+$("#issue_detail").show();
+$("#issue_edit").hide();
+
+$("#reply_div_<%#= @issue.id %>").html("<%#=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
+sd_create_editor_from_data(<%#= @issue.id%>, null, "100%","<%#=@issue.class.name%>");
+$(".homepagePostReplyBannerCount").html('<%#= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');*/
 location.reload();
 //edit里的编辑器貌似显示不出来，所以手动js生成。
 issue_desc_editor = KindEditor.create('#issue_description',

app/views/layouts/_new_feedback.html.erb

@@ -1,41 +1,51 @@
 <%= javascript_include_tag "feedback" %>
 
-<div class="scrollsidebar" id="scrollsidebar">
+<div class="scrollsidebar pr" id="scrollsidebar">
   <div class="side_content">
     <div class="side_list">
-      <div class="qr-code-border borderBottomNone"><img src="/images/wechat/trustie_QR.jpg" width="150" style="display:block;" /> </div>
-      <div class="side_title">
-        <a title="<%= l(:button_hide) %>" class="close_btn">
-          <span>
-          </span>
-        </a>
+      <div style="background-color:#fff; padding:10px 0; border:1px solid #aaa; border-bottom:none;">
+        <span class="fontGrey3 f14 ml40" style="vertical-align:top;">问题和建议</span>
+        <span class="hide-side-bar side-bar-circle fr mt3 mr10" title="关闭"><span class="side-bar-content">×</span></span>
+        <span class="close_btn side-bar-circle fr mt3 mr10" title="隐藏"><span class="side-bar-content" style="left:4px;">›</span></span>
       </div>
-      <div class="side_center">
-        <div class="custom_service">
+      <div style="background-color:#fff; border-left:1px solid #aaa; border-right:1px solid #aaa;">
+        <div class="custom_service tac">
           <% get_memo %>
           <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-              <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+              <%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => l(:label_feedback_tips) %>
               <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-              <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;height:21px" id="" onclick="f_submit();">
+              <span class="c_grey fl ml10">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>
+              <a href="javascript:void(0);" class="linkBlue f14 fr mr10" style="height:21px;" id="" onclick="f_submit();">
                 <%= l(:label_submit)%>
               </a>
+              <div class="cl"></div>
           <% end %>
         </div>
-        <div class="mt5" style="color: #269ac9;cursor: default">
+      </div>
+      <div style="background-color:#fff; border:1px solid #aaa; border-top:none; padding-top:5px;">
+        <div class="fl mt5 ml10 tac">
           <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
           <%#= l(:label_technical_support) %>
           <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
           <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
           <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
-          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="Trustie师姐师兄答疑群" title="Trustie师姐师兄答疑群"></a>
+          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
+          <p class="fontGrey3" style="padding-bottom:10px; padding-top:3px;">加入QQ群</p>
+        </div>
+        <div class="fr mr10 tac">
+          <img src="/images/wechat/trustie_QR.jpg" width="80" style="display:inline-block; margin-right:-5px;" /><p class="fontGrey3" style="padding-bottom:10px;">关注官方微信</p>
+        </div>
+        <div class="cl"></div>
+      </div>
     </div>
   </div>
-      <div class="side_bottom"></div>
+  <div class="show_btn tac">
+    <div style=" border:1px solid #aaa;">
+      <div style="height:79px;">
+        <img src="/images/dialog.png" width="18" class="mt10 mb5" />
+        <span class="f14 fontBlue">提<br />问</span>
       </div>
+      <span  class="closeSidebar f16">×</span>
     </div>
-  <div class="show_btn">
-    <span><%= l(:label_submit)%></span>
-    <a href="javascript:void(0)" class="closeSidebar"></a>
   </div>
 </div>

app/views/layouts/_user_courses.html.erb

@@ -2,10 +2,17 @@
     <li>
       <span class="user_icons_class"></span>
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
-      <p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu" title="<%= course.syllabus.title+' · '+(course.is_public? ? '公开班级：' : '私有班级：')+course.name+'（'+current_time_and_term(course)+'）' %>">
-        <%= link_to course.syllabus.title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:85px; display:inline-block;"%>
+      <p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu pr" >
+        <% title = "<span class='course-name'>#{course.syllabus.title}</span>".html_safe %>
+        <%= link_to title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
         <font class="fb c_grey" style="height:39px; line-height:39px; vertical-align:top;">·</font>
-        <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:85px; display:inline-block;"%>
+        <% classes = "<span class='course-name'>#{course.name}</span>".html_safe %>
+        <%= link_to classes, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
+        <span class="sub-menu-title c_dark">
+          课程名称：<%= course.syllabus.title %><br />
+          班级名称：<%= course.name+'（'+current_time_and_term(course)+'）' %><br />
+          班级属性：<%= course.is_public? ? '公开' : '私有' %>
+        </span>
       </p>
       <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
                   :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
@@ -106,11 +113,25 @@
     }
 
     $(".course_list_menu").each(function(){
-       var courseWidth = $(this).children().eq(0).width();
-       var classWidth = 170 -courseWidth;
+       var courseWidth = $(this).children().eq(0).children().width();
+       var classWidth = $(this).children().eq(2).children().width();
+       var newClassWidth = 182 - courseWidth;
+       var newCourseWidth = 182 - classWidth;
         console.log(courseWidth, classWidth);
-       if(courseWidth < 80){
-           $(this).children().eq(2).css("max-width",classWidth + "px");
+       if(courseWidth < 91 && classWidth > 91){
+           $(this).children().eq(2).css("max-width",newClassWidth + "px");
        }
+       if(classWidth < 91 && courseWidth > 91){
+           $(this).children().eq(0).css("max-width",newCourseWidth + "px");
+       }
+    })
+
+        $(".course-name").each(function(){
+            $(this).mouseenter(function(){
+                $(this).parent().parent().children().eq(3).show();
+            });
+            $(this).mouseleave(function(){
+                $(this).parent().parent().children().eq(3).hide();
+            });
         })
 </script>

app/views/layouts/base_courses.html.erb

@@ -1,6 +1,7 @@
 <%# course_model %>
-<%# course_file_num = visable_attachemnts_incourse(@course).count%>
-<% course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+<%# course_file_num = Attachment.where(:container_type => "Course", :container_id => @course.id).count %>
+
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% homework_num = visable_course_homework @course %>
 

app/views/layouts/base_forums.html.erb

@@ -187,7 +187,8 @@
             </div>
             <div class="fl">
               <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
-              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
+              <% user_name =  @forum.creator.show_name.empty? ? @forum.creator.name : @forum.creator.show_name %>
+              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= user_name %></a></div>
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>

app/views/memos/show.html.erb

@@ -58,7 +58,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
+        <%= link_to @memo.author.show_name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
       <div class="cl"></div>
       <div class="homepagePostIntro memo-content" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
@@ -90,7 +90,7 @@
       </div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
-        <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%= h reply.content.html_safe%></div>
+        <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%=  reply.content.gsub(/script/, "script&nbsp").html_safe %></div>
       </div>
       <script type="text/javascript">
           $(function(){
@@ -100,6 +100,8 @@
                   postContent= postContent.replace(/ {2}/g,"&nbsp; ");
                   postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
                   postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                  postContent = postContent.gsub(/<script>*/, "<script>");
+                  postContent = postContent.gsub(/<html>*/, "<html>");
                   $(this).html(postContent);
               });
               autoUrl('activity_description_<%= reply.id %>');

app/views/projects/_development_group.html.erb

@@ -44,6 +44,7 @@
 <% if allow_pull_request(@project) > 0 && allow_show_pull_request(@project) > 0 %>
     <div class="subNav">
       <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
+      <%= link_to "(#{pull_request_count(@project)})", project_pull_requests_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
       <% if User.current.member_of?(@project) %>
         <%= link_to "+新建请求", new_project_pull_request_path(:project_id => @project.id), :class => "subnav_green" %>
       <% end %>

app/views/projects/show.html.erb

@@ -29,17 +29,6 @@
     <!--CONTENT LIST-->
 
   </div>
-  <%# 时间紧，权限待优化 %>
-  <% unless @project.hidden_repo && !User.current.member_of?(@project) && !User.current.admin? %>
-      <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank?  %>
-          <div class="resources mt10">
-            <div class="homepagePostBrief">
-              <%= render :partial => "rep_static" %>
-              <div class="cl"></div>
-            </div>
-          </div>
-      <% end %>
-  <% end %>
 
   <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
 </div>

app/views/users/_course_newslist.html.erb

@@ -23,7 +23,7 @@
                   <% if activity.sticky == 1 %>
                       <span class="fl ml10 red-cir-btn">顶</span>
                   <% end%>
-                  <% u = User.where("id=?",activity.author_id).first%>
+                  <%# u = User.where("id=?",activity.author_id).first%>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -31,9 +31,9 @@
                 </div>
                 <div class="ml15 mt10">
                   <span class="grayTxt">
-                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                      发布者: <%= activity.author.show_name %>
                   </span>
-                  <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <span class="grayTxt">更新：<%= format_time(activity.course_acts.first.try(:updated_at)) %></span>
                   <% count=0 %>
                   <% count=activity.comments.count %>
                   <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>

app/views/users/_project_boardlist.html.erb

@@ -43,7 +43,7 @@
                 </div>
                 <div class="ml15 mt10 f12">
                   <span class="grayTxt">
-                      发帖人:<%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                      发帖人:<%=(u.try(:realname) != " " ? u.try(:lastname) + u.try(:firstname) : u.try(:login)) unless u.nil? %>
                   </span>
                   <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
                   <% all_comments = []%>

app/views/users/_project_issue.html.erb

@@ -1,4 +1,5 @@
-<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+<% unless activity.author.nil? %>
+    <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
       <div class="homepagePostBrief">
         <div class="homepagePostPortrait">
           <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@@ -97,9 +98,11 @@
       <div id="div_user_issue_reply_<%=user_activity_id%>">
         <%= render :partial => 'users/project_issue_reply', :locals => {:activity => activity, :user_activity_id => user_activity_id} %>
       </div>
-</div>
-<script type="text/javascript">
+    </div>
+    <script type="text/javascript">
         $(function(){
             user_card_show_hide();
         });
-</script>
+    </script>
+<% end %>
+

app/views/users/_project_issue_detail.html.erb

@@ -62,7 +62,7 @@
     <li>
       <p class="label03">&nbsp;指派&nbsp;&nbsp;:&nbsp;</p>
       <span class="pro_info_p" style="width:130px;">
-        <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %>
+        <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %>
         <a href="javascript:void(0)" class="pic_edit2 ml5" style="vertical-align:top;"></a></span>
       <%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project),
                { :include_blank => false,:selected => @assign_to_id ? @assign_to_id : 0},

app/views/users/user_organizations.html.erb

@@ -25,7 +25,8 @@
                     <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %>
                 </div>
                 <div class="orgIntro"><%= org.description %></div>
-                <div class="postCreater">创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>
+                <% user_name =  User.find(org.creator_id).show_name.empty? ? User.find(org.creator_id) : User.find(org.creator_id).show_name %>
+                <div class="postCreater">创建者：<%= link_to user_name, user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>
                 <div class="postDate fl mr40">创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %></div>
                 <div class="postCreater">您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %></div>
               </div>

config/locales/commons/zh.yml

@@ -358,7 +358,7 @@ zh:
   #  意见反馈
   # 
   label_feedback: 意见反馈
-  label_feedback_tips: "请在此发布平台问题和建议，或直接加入答疑群，谢谢！"
+  label_feedback_tips: "在此输入对平台问题和建议，您也可以通过QQ、微信留言，谢谢！"
   label_technical_support: "QQ 在线支持："
   label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
   label_feedback_value: "该帖来自用户反馈:)"

db/migrate/20160913063446_add_index_to_student_works_scores.rb

@@ -0,0 +1,6 @@
+class AddIndexToStudentWorksScores < ActiveRecord::Migration
+  def change
+    add_index :student_works_scores, :user_id, name: 'user_id'
+    add_index :student_works_scores, :student_work_id, name: 'student_work_id'
+  end
+end

db/migrate/20160914073340_update_user_extensions.rb

@@ -0,0 +1,9 @@
+class UpdateUserExtensions < ActiveRecord::Migration
+  def up
+    ues = UserExtensions.where(:school_id => 0)
+    ues.update_all(:school_id => nil)
+  end
+
+  def down
+  end
+end

db/migrate/20160918033136_update_issue_author.rb

@@ -0,0 +1,13 @@
+class UpdateIssueAuthor < ActiveRecord::Migration
+  def up
+    begin
+      issue = Issue.find(9377)
+      issue.update_column(:author_id, 15341)
+    rescue Exception => e
+      puts e
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20160918074635_update_attach_public_for_message.rb

@@ -0,0 +1,13 @@
+class UpdateAttachPublicForMessage < ActiveRecord::Migration
+  def up
+    begin
+      attachments = Attachment.where(:container_type => "Message", :is_public => 0)
+      attachments.update_all(:is_public => 1)
+    rescue Exception => e
+      puts e
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160907061917) do
+ActiveRecord::Schema.define(:version => 20160907080621) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -56,8 +56,8 @@ ActiveRecord::Schema.define(:version => 20160907061917) do
     t.integer  "user_id"
     t.integer  "applied_id"
     t.string   "applied_type"
-    t.integer  "viewed",          :default => 0
-    t.integer  "status",          :default => 0
+    t.integer  "viewed"
+    t.integer  "status"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
     t.string   "name"
@@ -173,6 +173,7 @@ ActiveRecord::Schema.define(:version => 20160907061917) do
     t.integer  "quotes"
     t.integer  "is_publish",                   :default => 1
     t.date     "publish_time"
+    t.boolean  "init_file",                    :default => false
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
@@ -318,6 +319,8 @@ ActiveRecord::Schema.define(:version => 20160907061917) do
     t.date     "commit_date"
     t.string   "scmid"
     t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "type",          :default => 0
   end
 
   add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"

lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb

@@ -172,6 +172,72 @@ module Redmine
           {:files => saved_attachments, :unsaved => unsaved_attachments}
         end
 
+        # 扩展方法,因为类型太多，为了不影响其它的
+        # 最终需要形成一个方法
+        def save_attachments_containers(attachments, author, is_public)
+          # 清除临时文件
+          if attachments
+            tempAttach = attachments[:dummy]
+            if  tempAttach && tempAttach[:file]
+              attachments.delete(:dummy)
+            end
+          end
+
+          if attachments.is_a?(Hash)
+            attachments = attachments.stringify_keys
+            attachments = attachments.to_a.sort {|a, b|
+              if a.first.to_i > 0 && b.first.to_i > 0
+                a.first.to_i <=> b.first.to_i
+              elsif a.first.to_i > 0
+                1
+              elsif b.first.to_i > 0
+                -1
+              else
+                a.first <=> b.first
+              end
+            }
+            attachments = attachments.map(&:last)
+          end
+          if attachments.is_a?(Array)
+            attachments.each do |attachment|
+              if attachment.is_a?(Hash)
+                a = nil
+                file = attachment['file']
+                token = attachment['token']
+                t = file && file.size > 0
+                if file && file.size > 0
+                  a = Attachment.create(:file => file, :author => author)
+                elsif token
+                  # 通过token值找到对应的attachment
+                  a = Attachment.find_by_token_only(token)
+                  if a
+                    a.filename = attachment['filename'] unless attachment['filename'].blank?
+                    a.content_type = attachment['content_type']
+                  end
+                end
+              end
+
+              if a && !attachment['is_public_checkbox']
+                # 考虑到更新操作，所以全部设置为公开，私有项目、课程是不能访问的
+                a.is_public = true
+              elsif a && attachment['is_public_checkbox']
+                a.is_public = true
+              end
+              set_attachment_public(a) if a
+              next unless a
+              a.description = attachment['description'].to_s.strip
+              a.attachtype = @curattachment_type
+              if a.new_record?
+                unsaved_attachments << a
+              else
+                saved_attachments << a
+              end
+            end
+          end
+          {:files => saved_attachments, :unsaved => unsaved_attachments}
+        end
+
+
         def attach_saved_attachments
           saved_attachments.each do |attachment|
             self.attachments << attachment

public/assets/wechat/edit_userinfo.html

@@ -11,7 +11,7 @@
 
     <form name="regFrm" novalidate>
 
-        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的姓名全称" maxlength="30" /></div>
+        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的真实姓名" maxlength="30" /></div>
         <div class="course-list-row f13 c-grey3 mt10" style="height:auto;">
             <div class="mt5" style="line-height:20px">
                 <span class="ml15 c-grey3">性别</span>
@@ -33,6 +33,12 @@
                 <span class="f12 c-red fl ml15" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
             </div>
         </div>
+        <div ng-show="lastname == '' " class="f12 c-grey6 mt10 ml15">
+            <span class="f13 c-grey3">提示</span>
+            <ul class="mb15 mt5 ml10 new-tip">
+                <li><span class="project-intro-dot">•</span>您尚未完善您的基本资料，完善后可使用更多功能</li>
+            </ul>
+        </div>
         <div class="bottom-tab-wrap mt10">
             <a ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
             <a ng-click="confirm(regFrm)" ng-class="[{'btn-disabled':!regFrm.$valid} ]" class="weixin-tab link-blue2 border-top">确定</a>

public/assets/wechat/login.html

@@ -4,13 +4,13 @@
     <form name="loginFrm" novalidate>
     <div class="blue-title">绑定<span class="f13 blue-title-sub" ng-click="goReg()">注册</span></div>
     <div class="input-box-wrap login-wrap mt30">
-        <input name="login" ng-model="user.login" required class="input-box" placeholder="请输入电子邮箱地址或登录名" />
+        <input name="login" ng-model="user.login" required class="input-box" placeholder="请输入平台上的注册邮箱或登录名" />
         <div ng-show="loginFrm.$submitted || loginFrm.login.$touched">
             <span ng-show="loginFrm.login.$error.required" class="c-red fl f12">电子邮箱地址或登录名不能为空</span>
         </div>
     </div>
     <div class="input-box-wrap login-wrap mt10 mb20">
-        <input class="input-box" placeholder="请输入密码" name="password" type="password" ng-model="user.password" required />
+        <input class="input-box" placeholder="请输入帐号的登录密码" name="password" type="password" ng-model="user.password" required />
         <div ng-show="loginFrm.$submitted || loginFrm.password.$touched">
             <span ng-show="loginFrm.password.$error.required" class="c-red fl f12">密码不能为空</span>
         </div>

public/javascripts/feedback.js

@@ -35,7 +35,7 @@
             //show
             show_btn.bind("click",function() {
                 $(this).animate({width: '0px'},"fast");
-                sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
+                sideContent.stop(true, true).delay(200).animate({ width: '180px'},"fast");
                 cookiesave('minStatue','false','','','');
             });
         });	//end this.each
@@ -83,7 +83,7 @@ $(function(){
         $("#scrollsidebar").css("display","none");
         return;
     }
-    $(".closeSidebar").click(function(){
+    $(".closeSidebar, .hide-side-bar").click(function(){
         $(".show_btn").css("display","none");
         $("#scrollsidebar").css("display","none");
         return false;

public/javascripts/wechat/controllers/project.js

@@ -155,7 +155,7 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
     vm.currentTab = rms.get('tab_num');
 
     //
-    if(!vm.currentTab){
+    if(!vm.currentTab || !vm.project){
         $http.get(config.apiUrl+ 'projects/'+projectid+"?token="+auth.token()).then(
             function(response) {
                 console.log(response.data);

public/javascripts/wechat/controllers/reg.js

@@ -36,7 +36,8 @@ app.controller('RegController', ['$scope', '$http', '$location', 'alertService',
                     vm.successDialog.showMessage("提示","注册且绑定微信成功", function(){
 //                        $location.path("/activities");
 //                        window.WeixinJSBridge.call('closeWindow');
-                        wx.closeWindow();
+//                        wx.closeWindow();
+                        $location.path("/edit_userinfo");
                     });
                 }
             }, function (response) {

public/stylesheets/css/common.css

@@ -608,7 +608,6 @@ a:hover.sy_btn_blue{ background: #2788d0;}
 .is_public_checkbox{margin-left: 15px;margin-right: 10px;}
 .author_name{color: #3ca5c6 !important;}
 .ke-container-default{max-width: 100%;}
-.borderRadius {border-radius:5px;}
 
 /*状态提示图标*/
 .success-icon {background:url("/images/icons_ziliao.png") 0 -28px no-repeat; padding-left:25px;}

public/stylesheets/css/courses.css

@@ -516,9 +516,6 @@ a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;borde
 a:hover.blueCir{ background:#3598db; color:#fff;}
 .proList {background-color:#eaeaea; padding:5px 10px; display:block; max-width:655px; float:left;}
 
-.borderRadius {border-radius:5px;}
-.tac {text-align:center;}
-
 .reCon{ margin:5px; width:710px;}
 .reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}
 .filesTag{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;cursor: pointer }

public/stylesheets/css/project.css

@@ -549,7 +549,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .merge-discussion-input textarea {width:720px; height:80px; font-size:13px; line-height:16px; color:#484848; padding:5px;}
 
 /*新版项目列表新增*/
-.new_project_title{ font-size:16px; color:#333; max-width:560px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
+.new_project_title{ font-size:16px; color:#333; max-width:480px; font-weight:normal;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;  }
 .icons_project_list{ width:8px; height:8px; border:2px solid #fff; background:#3b94d6;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;-webkit-box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5);-moz-box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5);box-shadow: 0px 2px 5px rgba(146, 153, 169, 0.5); }
 .icons_project_favorite {background: url(/images/syllabus/sy_icons_star.png) 0px 0px no-repeat; width:20px; height:20px; display:block; float:left;}
 .icons_project_star{background: url(/images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; float:left;}

public/stylesheets/css/public.css

@@ -116,36 +116,32 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n
 .softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}
 
 /*意见反馈*/
-.qr-code-border {border:2px solid #269ac9;}
 html{ overflow-x:hidden;}
 .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
-.side_content{width:154px; height:auto; overflow:hidden; float:left; }
-.side_content .side_list {width:154px;overflow:hidden;}
-.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;}
-.show_btn span { display:none;}
-.close_btn{width:24px;height:24px;cursor:pointer;}
-.side_title,.side_bottom,.close_btn,.show_btn {background:url(/images/sidebar_bg.png) no-repeat; }
+.side_content{width:180px; height:auto; overflow:hidden; float:left;}
+.side_content .side_list {width:180px;overflow:hidden;}
+.show_btn{ width:0; height:100px; overflow:hidden; float:left; margin-top:200px; cursor:pointer; background-color:#fff;}
+.close_btn{cursor:pointer;}
+.side_title,.side_bottom {background:url(/images/sidebar_bg.png) no-repeat; }
 .side_title {height:35px;}
 .side_bottom { height:8px;}
 .side_center {font-family:Verdana, Geneva, sans-serif; padding:0px 12px; font-size:12px;}
-.close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;}
-.close_btn span { display:none;}
 .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
 .msgserver { margin:10px 0 0px 5px;}
 .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; }
-.opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
+.opnionText{box-shadow:none; width:150px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;}
 a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;}
 a.opnionButton:hover{background: #297fb8; }
 /* blue skin as the default skin */
 .side_title {background-position:-195px 0;}
 .side_center {background:url(/images/blue_line.png) repeat-y center; }
 .side_bottom {background-position:-195px -50px;}
-.close_btn {background-position:-44px 0;}
-.close_btn:hover {background-position:-66px 0;}
-.show_btn {background-position:-119px 0;}
 .msgserver a {color:#269ac9; }
 .msgserver a:hover { text-decoration:underline; }
-.closeSidebar {background:url(/images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;}
+.closeSidebar {width:26px; height:18px; line-height:18px; vertical-align:middle; border-top:1px solid #aaa; color:#aaa; display:block;}
+
+.side-bar-circle {width:13px; height:13px; font-size:14px; color:#aaa; border:1px solid #aaa; border-radius:50%; display:block; font-weight:bold; position:relative; cursor:pointer;}
+.side-bar-content {position:absolute; top:-5px; left:1px;}
 
 
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}

public/stylesheets/css/structure.css

@@ -596,7 +596,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
 .user_sub_menu li a:hover,.user_sub_menu li a:target {  color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;}
 .user_sub_menu li a:hover,.user_sub_menu li a:target{}
 .user_sub_menu li:last-child a {  }
-.user_sub_menu li p {padding:0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;}
+.user_sub_menu li p {padding:0 15px 0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;}
 .user_sub_menu li p:hover {background:#fff;}
 .user_sub_menu li p:hover a {background:#fff;}
 .user_sub_menu li p:hover,.user_sub_menu li p:target {color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;}
@@ -617,6 +617,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
     width:20px;
     height:20px;
     background:url(/images/user/icons_user_leftnav.png) 0px -34px no-repeat;
+    z-index:99;
 }
 a.user_navmorebox{ display:block; width:238px; height:20px; position:relative; background:#f8f8f8;border:1px solid #e5e5e5; border-bottom:none;}
 a:hover.user_navmorebox{ background:#fff;}
@@ -639,6 +640,7 @@ a.user_navmorebox .user_icons_closeclass{
     background:url(/images/user/icons_user_leftnav.png) -25px -347px no-repeat;
 }
 .show-all-sub {position:absolute; top:18px; right:15px;}
+.sub-menu-title {position:absolute; border:1px solid #ddd; background-color:#fff; padding:2px 5px; z-index:99; white-space:nowrap; left:25px; top:35px; display:none;}
 /* 个人主页左侧导航更多功能 */
 .user_navmore_box {position:absolute; width:15px; height:15px; right:13px; top:17px; cursor:pointer;}
 .user_navmore_box ul li:hover ul {display:block; }