Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

Conflicts:
	app/views/issues/_form.html.erb
	db/schema.rb

Gemfile

@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
-  gem "test-unit", "~>3.0"
+ # gem "test-unit", "~>3.0"
 
 ### profile
-  gem 'oneapm_rpm'
+ # gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

app/api/mobile/apis/users.rb

@@ -4,6 +4,61 @@ module Mobile
     class Users < Grape::API
       resource :users do
 
+        desc "我的资料"
+        params do
+          requires :token, type: String
+        end
+
+        get 'get_userinfo' do
+          authenticate!
+          present :data, current_user, with: Mobile::Entities::User
+          present :status, 0
+        end
+
+        desc "上传头像"
+        params do
+          requires :token, type: String
+          requires :imgdata, type: String
+        end
+
+        post 'upload_head' do
+          authenticate!
+          #直接生成头像
+          dirPath = "public/images/avatars/User"
+
+          fileDir = dirPath + "/"+current_user.id.to_s
+          imgdata = Base64.decode64(params[:imgdata].split(",")[1])
+          if imgdata.length > 1024*1024
+            present :message,"上传图片不能超过1M"
+            present :status, -1
+          else
+            begin
+              File.open(fileDir,'wb'){ |f| f.write(imgdata) }
+              present :status, 0
+            rescue
+              present :message,"上传失败"
+              present :status, -1
+            end
+          end
+        end
+
+        desc "解除绑定"
+        params do
+          requires :token, type: String
+        end
+
+        post 'user_unbind' do
+          authenticate!
+
+          user = current_user
+          uw = user.user_wechat
+
+          us = UsersService.new
+          us.wechat_unbind user.user_wechat
+
+          present :status, 0
+        end
+
         desc "查询是否已绑定"
         params do
           requires :openid, type: String, desc: 'wechat openid'
@@ -221,6 +276,73 @@ module Mobile
           present :data,my_jours,with:Mobile::Entities::Jours
           present :status,0
         end
+
+        desc "修改我的资料"
+
+        params do
+          requires :token, type: String
+          requires :lastname, type: String
+          requires :sex, type: Integer
+          requires :mail, type: String
+        end
+
+        post 'edit_userinfo' do
+          authenticate!
+          user = current_user
+          status = 0
+          message = ""
+
+          #昵称 不能超过30个字符
+          if params[:lastname].length > 30 then
+            message = "姓名不能超过30个字符!"
+            status = -1
+          end
+
+          if params[:mail].length > 60 then
+            message = "邮箱地址不能超过60个字符!"
+            status = -1
+          end
+
+          if !(params[:mail].match(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i))
+            message = "请输入正确的邮箱地址!"
+            status = -1
+          end
+
+          if status == 0
+            # 修改邮箱的时候同步修改到gitlab
+            if user.mail != params[:mail]
+              g = Gitlab.client
+              begin
+                g.edit_user(user.gid, :email => params[:mail])
+              rescue
+                Rails.logger.error "sync user's email of gitlab failed!"
+              end
+            end
+
+            user.mail = params[:mail]
+
+            user.lastname = params[:lastname]
+
+            se = user.extensions
+
+            se.gender = params[:sex]
+
+            if user.save && se.save
+              status = 0
+            else
+              message = "该邮箱地址已被使用！"
+              status = -1
+            end
+          end
+
+          if status == 0
+            present :data, current_user, with: Mobile::Entities::User
+            present :status, 0
+          else
+            present :status, -1
+            present :message, message
+          end
+        end
       end
     end
   end

app/api/mobile/entities/user.rb

@@ -30,15 +30,24 @@ module Mobile
                   u.nil? ? "" : u.show_name
                 when :roles_id
                   u[:roles_id].nil? ? nil : u.roles_id
+                when :login
+                  u.login
+                when :lastname
+                  u.lastname
+                when :mail
+                  u.mail
               end
             end
           end
-
         end
       end
 
       expose :id 
       #头像
+      user_expose :login
+      user_expose :lastname
+      #邮箱地址
+      user_expose :mail
       expose :nickname
       #真名
       user_expose :img_url
@@ -51,8 +60,6 @@ module Mobile
       #我的二维码
       #工作单位
       user_expose :work_unit
-      #邮箱地址
-      user_expose :mail
       #地区
       user_expose :location
       #签名

app/controllers/issues_controller.rb

@@ -180,6 +180,7 @@ class IssuesController < ApplicationController
     end
   end
 
+  # 用户发布新issue
   def create
     call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
     @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
@@ -222,6 +223,7 @@ class IssuesController < ApplicationController
   end
 
   def edit
+    # 修改实例变量的值
     return unless update_issue_from_params
 
     respond_to do |format|
@@ -230,6 +232,7 @@ class IssuesController < ApplicationController
     end
   end
 
+  # 用户编辑更改issue
   def update
     if params[:issue_detail]
       issue = Issue.find(params[:id])
@@ -237,6 +240,7 @@ class IssuesController < ApplicationController
       @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
@@ -572,6 +576,7 @@ class IssuesController < ApplicationController
     @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
     @time_entry.attributes = params[:time_entry]
 
+    # 更新issue状态时，journal表产生记录，返回@current_journal
     @issue.init_journal(User.current)
 
     issue_attributes = params[:issue]

app/controllers/org_member_controller.rb

@@ -8,18 +8,33 @@ class OrgMemberController < ApplicationController
     end
   end
 
+  # 组织子成员，及其分页
+  def org_member_paging
+    @organization = Organization.find(params[:org])
+
+    if User.current.admin? || User.current.admin_of_org?(@organization)
+      @members = OrgMember.where(:organization_id => @organization.id).all.sort
+      @members = paginateHelper @members, 20
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   def create
-    @org = Organization.find(params[:org])
+    @organization = Organization.find(params[:org])
     if params[:membership].nil?
       @fail_hint = l(:label_blank_user_lists_for_org)
     else
       member_ids = params[:membership][:user_ids]
       role_id = params[:orgRole]
       member_ids.each do |user_id|
-        member =  OrgMember.create(:user_id=>user_id, :created_at => Time.now)
-        @org.org_members << member
+        member =  OrgMember.create(:user_id => user_id, :created_at => Time.now)
+        @organization.org_members << member
         OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id)
       end
+      @members = (@organization.org_members).sort
+      @members = paginateHelper @members, 20
     end
     respond_to do |format|
       format.js
@@ -32,7 +47,11 @@ class OrgMemberController < ApplicationController
    @member_role = @member.org_member_roles[0]
    @member_role.role_id =  params[:org_member][:role_ids][0]
    @member_role.save
-   @org = @member.organization
+   @organization = @member.organization
+   # 成员编辑角色后分页
+   @members = (@organization.org_members).sort
+   @members = paginateHelper @members, 20
+
     respond_to do |format|
       format.js
     end
@@ -44,8 +63,10 @@ class OrgMemberController < ApplicationController
 
   def destroy
     member = OrgMember.find(params[:id])
-    @org = member.organization
+    @organization = member.organization
     member.destroy
+    @members = (@organization.org_members).sort
+    @members = paginateHelper @members, 20
     respond_to do |format|
       format.js
     end

app/controllers/organizations_controller.rb

@@ -421,6 +421,8 @@ class OrganizationsController < ApplicationController
     @organization = Organization.find(params[:id])
 
     if User.current.admin? || User.current.admin_of_org?(@organization)
+      @members = OrgMember.where(:organization_id => @organization.id).all.sort
+      @members = paginateHelper @members, 20
     else
       render_403
     end
@@ -451,10 +453,11 @@ class OrganizationsController < ApplicationController
 
   def members
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
-      @members = OrgMember.where("organization_id =?", @organization.id)
+      @members = OrgMember.where(:organization_id => @organization.id).all.sort
     else
       render_403
     end
+    @members = paginateHelper @members, 20
   end
 
   def  more_org_projects

app/controllers/projects_controller.rb

@@ -580,6 +580,7 @@ class ProjectsController < ApplicationController
       end
     end
     @members = paginateHelper @members
+
   end
 
   def update_message_status(user, project)

app/controllers/users_controller.rb

@@ -2677,7 +2677,8 @@ class UsersController < ApplicationController
     project_ids.each do |project_id|
       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)
+      #  message = Message.create(:board_id => project.boards.first.id, :subject => news.title, :content => news.description, :author_id => User.current.id)
+        message = News.create(:project_id => project.id, :title => news.title, :summary => news.summary, :description => news.description, :author_id => User.current.id, :created_on => Time.now )
         # record forward to table forwards if new record is valid
         if message.valid?
           news.forwards << Forward.new(:to_type => message.class.name, :to_id => message.id)
@@ -3515,11 +3516,15 @@ class UsersController < ApplicationController
     @order, @c_sort, @type, @list_type = 1, 2, 1, 1
     #limit = 5
 
-    @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    # 用户的所有项目
+   # @my_projects = @user.projects.visible.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_projects = @user.projects.where("projects.user_id = #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
     @my_projects_count = @my_projects.count
 
-    @my_joined_projects = @user.projects.visible.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    #@my_joined_projects = @user.projects.visible.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
+    @my_joined_projects = @user.projects.where("projects.user_id != #{@user.id}").select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS updatetime").order("updatetime DESC")
     @my_joined_projects_count = @my_joined_projects.count
+
     respond_to do |format|
       format.html {render :layout => 'new_base_user'}
     end

app/controllers/wechats_controller.rb

@@ -167,6 +167,27 @@ class WechatsController < ActionController::Base
     end
   end
 
+  on :click, with: 'UNBIND' do |request, key|
+    uw = user_binded?(request[:FromUserName])
+    unless uw
+      request.reply.text "您还未绑定帐号"
+    else
+      #解除绑定
+      us = UsersService.new
+      us.wechat_unbind uw
+
+      tmpurl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities'}&response_type=code&scope=snsapi_base&state=login&connect_redirect=1#wechat_redirect"
+      news = (1..1).each_with_object([]) { |n, memo| memo << { title: '重新绑定提醒',
+                                                               content: "尊敬的用户，您已解除绑定。\n解除时间：#{format_time(Time.now)}\n点击进入重新绑定！"} }
+      request.reply.news(news) do |article, n, index| # article is return object
+        url = tmpurl
+        article.item title: "#{n[:title]}",
+                     description: n[:content],
+                     url: url
+      end
+    end
+  end
+
   def join_class_request(request)
     openid = request[:FromUserName]
     wl = WechatLog.where("openid = '#{openid}' and request_raw like '%\"Event\":\"click\"%'").order('id desc').first

app/helpers/org_member_helper.rb

@@ -1,5 +1,6 @@
 module OrgMemberHelper
   include ApplicationHelper
+
   def find_user_not_in_current_org_by_name org
     if params[:q] && params[:q].lstrip.rstrip != ""
       scope = Principal.active.sorted.not_member_of_org(org).like(params[:q])

app/models/issue.rb

@@ -757,6 +757,7 @@ class Issue < ActiveRecord::Base
     end
   end
 
+# 更新issue时，判断更新之前当前是否有自动更新的评论
   def init_journal(user, notes = "")
     @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
     if new_record?
@@ -1454,8 +1455,18 @@ class Issue < ActiveRecord::Base
   end
 
   # Callback on file attachment
+  # 在执行issue模块前 执行：当附件被添加时，产生评论
+  # 第一次创建issue时，@current_journal为nil，评论不产生
+  # 当附件名称重名时，也不产生评论
+  # 当更新isuue时，第一次上传的附件的已经存在，则不更新次附件评论
   def attachment_added(obj)
-    if @current_journal && @current_journal.user_id == obj.author_id && JournalDetail.find_all_by_value(obj.filename).count == 0
+
+      # 找出该issue评论表中，附件重名的个数
+      jor = Journal.where(:journalized_id => self.id)
+      jor_ids = jor.empty? ? "(-1)" : "(" + jor.map{|detail| detail.id}.join(",") + ")"
+      jor_details_count = JournalDetail.where("journal_id in #{jor_ids} and value = '#{obj.filename}'").count
+
+    if @current_journal && @current_journal.user_id == obj.author_id && jor_details_count == 0 && self.attachments.find_all_by_filename(obj.filename).count == 0
       @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => obj.id, :value => obj.filename)
 
     end

app/services/courses_service.rb

@@ -941,46 +941,36 @@ class CoursesService
      :description => description, :homework_state => state,:open_anonymous_evaluation => open_anonymous_evaluation}
   end
 
-
-  def student_homework_score(groupid,course_id, nums, score_sort_by)
-    #teachers = find_course_teachers(@course)
-    #start_from = start_from * nums
+  def student_homework_score(groupid,course_id, nums, score_sort_by, sort_type = 'score')
     sql_select = ""
     if groupid == 0
-      if nums == 0
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id}) GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id} AND
-        students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
-      else
-        sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-            WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id
-        AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id})  GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id} AND
-        students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by} " #limit #{start_from}, #{nums}"
-
-      end
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.work_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = course_id
+          AND student_works.user_id = members.user_id
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{course_id} AND ccs.user_id = members.user_id
+        ) AS act_score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{course_id} ORDER BY #{sort_type} #{score_sort_by}"
     else
-      sql_select = "SELECT members.*, SUM(homework_attaches.score) as score FROM members, homework_attaches
-        WHERE members.course_id = #{course_id} AND members.user_id in (SELECT students_for_courses.student_id FROM students_for_courses WHERE course_id = #{course_id}) AND members.user_id = homework_attaches.user_id
-        and members.course_group_id = #{groupid} AND homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id})
-        GROUP BY members.user_id
-        UNION all
-        SELECT members.*, 0 as  score FROM members,homework_attaches,students_for_courses WHERE members.course_id = #{course_id}
-        and members.course_group_id = #{groupid} AND
-        students_for_courses.course_id = #{course_id} and members.user_id = students_for_courses.student_id AND
-        members.user_id NOT IN (SELECT homework_attaches.user_id FROM homework_attaches WHERE homework_attaches.bid_id in (SELECT bid_id FROM homework_for_courses WHERE course_id = #{course_id} )
-        )
-        GROUP BY members.user_id ORDER BY score #{score_sort_by}"
+      sql_select = "SELECT members.*,(
+          SELECT SUM(student_works.work_score)
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{course_id}
+          AND student_works.user_id = members.user_id
+        ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 +
+         resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{course_id} AND ccs.user_id = members.user_id
+        ) AS act_score
+        FROM members
+        JOIN students_for_courses
+        ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id
+        WHERE members.course_id = #{course_id} AND members.course_group_id = #{groupid} ORDER BY #{sort_type} #{score_sort_by}"
     end
     sql = ActiveRecord::Base.connection()
     homework_scores = Member.find_by_sql(sql_select)

app/services/users_service.rb

@@ -1,3 +1,4 @@
+#coding=utf-8
 class UsersService
   include ApplicationHelper
   include AccountHelper
@@ -319,8 +320,22 @@ class UsersService
     my_jours_arr
   end
 
+  def wechat_unbind uw
+    user = uw.user
 
+    #发重新绑定的微信模版消息
 
+    type = "login"
+    title = "尊敬的用户，您已解除绑定。"
+    key1 = "个人原因"
+    remark = "点击进入重新绑定。"
 
+    ws = WechatService.new
+    ws.rebind_notice user.id, type, user.id, title, key1,format_time(Time.now), remark
+
+    uw.user_id = nil
+    uw.delete
+
+  end
 
 end

app/services/wechat_service.rb

@@ -445,4 +445,41 @@ class WechatService
     end
   end
 
+  def rebind_notice(user_id, type, id, first, key1, key2,remark="")
+    uw = UserWechat.where(user_id: user_id).first
+    unless uw.nil?
+      data = {
+          touser:uw.openid,
+          template_id:Wechat.config.rebind_notice,
+          url:Wechat.config.auto_openid_url_1+Wechat.config.auto_openid_url_2+"login"+Wechat.config.auto_openid_url_3,
+          topcolor:"#FF0000",
+          data:{
+              first: {
+                  value:first,
+                  color:"#707070"
+              },
+              keyword1:{
+                  value:key1,
+                  color:"#707070"
+              },
+              keyword2:{
+                  value:key2,
+                  color:"#707070"
+              },
+              remark:{
+                  value:remark,
+                  color:"#707070"
+              }
+          }
+      }
+      #data = three_keys_template uw.openid,Wechat.config.create_class_notice, type, id, first, key1, key2, key3, remark
+      begin
+        req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
+      rescue Exception => e
+        Rails.logger.error  "[rebind_notice] ===> #{e}"
+      end
+      Rails.logger.info "send over. #{req}"
+    end
+  end
+
 end

app/views/forums/index.html.erb

@@ -74,7 +74,6 @@
   });
   function check_and_submit(doc){
       $("#error").html('').hide();
-      check_forum_name();
     if(  $("textarea[name='forum[name]']").val().trim() == "" &&  $("textarea[name='forum[description]']").val().trim()  != "" ){
         $("#error").html("名称不能为空").show();
         return;
@@ -98,7 +97,6 @@
               '<%= check_forum_name_forums_path %>',
               {"forum_name":encodeURIComponent(name)},
              function(data){
-
                  if( data == 'true'){
                      $("#error").html("贴吧名称已经存在").show();
                      check_pass = false;

app/views/issues/_form.html.erb

@@ -78,7 +78,7 @@
     <div class="cl"></div>
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
-<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>
+<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80" id="issue_confirm"> 确定</a>
 <% if params[:action] == "new" %>
     <% if @copy_from %>
         <%= link_to "取消", issue_path(@copy_from), :class => "grey_btn fl mr50 ml10" %>

app/views/issues/update.js.erb

@@ -1,12 +1,5 @@
 <% 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',
         {"width":"85%",
@@ -31,6 +24,7 @@ issue_desc_editor = KindEditor.create('#issue_description',
 //            "allowFileManager":true,
 //            "uploadJson":"/kindeditor/upload",
 //            "fileManagerJson":"/kindeditor/filemanager"});
+
 <%else%>
     alert('<%=  @issue.errors.full_messages[0].to_s%>')
 <%end %>

app/views/layouts/_logined_header_show.html.erb

@@ -38,7 +38,7 @@
         <a href ="javascript:void(0);" disabled="true"><%= image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:alt=>"头像", :id => "nh_user_logo", :class => "portraitRadius") %></a>
         <ul class="topnav_login_list none" id="topnav_login_list">
           <li>
-            <a href ="javascript:void(0);" class="menuGrey" disabled="true">修改资料</a>
+            <%= link_to "修改资料", my_account_path(:tip => 1), :class => "menuGrey"%>
           </li>
           <li>
             <a href ="javascript:void(0);" class="menuGrey" disabled="true">我的组织</a>
@@ -48,7 +48,7 @@
           </li>
           <!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
           <li>
-            <%= link_to "退出",logout_url_without_domain,:class => "menuGrey",:method => "post"%>
+            <%= link_to "退出", logout_url_without_domain, :class => "menuGrey", :method => "post"%>
           </li>
         </ul>
       </li>

app/views/layouts/new_base_user_show.html.erb

@@ -103,7 +103,7 @@
     <div class="homepageLeft mt10" id="LSide">
       <div class="user_leftinfo mb10">
         <% if User.current.logged?%>
-            <a href ="javascript:void(0);" disabled="true" class="user_leftinfo_img"><%= image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_user_tx')%></a>
+            <a href ="javascript:void(0);" disabled="true" class="user_leftinfo_img"><%= image_tag(url_to_avatar(@user), width:"74", height: "74", :id=>'nh_user_tx')%></a>
         <% else %>
             <img src="images/user/male.jpg" width="74" height="74" />
         <% end %>
@@ -112,7 +112,7 @@
         <% end %>
         <div class="user_info_inner">
           <div class=" user_leftinfo_namebox" >
-            <a href="javascript:void(0);" class="user_leftinfo_name"><%=@user.show_name %></a>
+            <a href="javascript:void(0);" class="user_leftinfo_name"><%= @user.show_name %></a>
             <% if @user.user_extensions && @user.user_extensions.identity %>
                 <span class="user_cirbtn_yellow" ><%= get_user_roll @user %></span>
             <% end%>
@@ -123,7 +123,7 @@
                 <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
               </div>
             </div>
-            <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
+            <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id) %>');"><%= @user.user_extensions.brief_introduction %></textarea>
           </div>
           <ul class="user_atten clear">
             <li>

app/views/memos/show.html.erb

@@ -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" id="activity_description_<%= reply.id %>"><%= h reply.content%></div>
+        <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= h reply.content.html_safe%></div>
       </div>
       <script type="text/javascript">
           $(function(){

app/views/my/account.html.erb

@@ -70,15 +70,15 @@
             </select>
             <span nhname="tag" nh_tag_1="true" style='display:none;'>
               <% if !User.current.user_extensions.nil? && !User.current.user_extensions.student_id.nil? %>
-                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID),:style=>"width:127px;" %>
+                <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => l(:label_account_identity_studentID),:style => "width:127px;" %>
               <% else %>
-                <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID),:style=>"60px" %></span>
+                <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID), :style => "60px" %></span>
               <% end %>
             </span>
             <span id="identity_hint" style="display: none"></span>
           </li>
 
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname,@user.lastname+@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %><span id="last_name_notice" class="none c_red">姓名不能为空</span>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname, @user.lastname+@user.firstname, :no_label => true, :required => true, :nh_required => "1",:class => "w210" %><span id="last_name_notice" class="none c_red">姓名不能为空</span>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
             <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
@@ -90,6 +90,7 @@
           </li>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
+            <!-- 基本资料页面单位审核显示 -->
             <% if User.current.user_extensions.nil? %>
                 <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                 <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" placeholder="     --请选择您所属的单位--"/>
@@ -98,13 +99,14 @@
                   <span id="hint" style="color: #7f7f7f;display: none"><a id="school_num" href="javascript:void(0)" style="color: red" ></a><a id="search_condition" href="javascript:void(0)"></a></span>
                 </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
+            <!-- 从业者选择单位名称 -->
             <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
                 <% if User.current.user_extensions.school_id.nil? %>
                     <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
                     <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
                 <% else %>
                     <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text"value="<%= User.current.user_extensions.school %>" >
-                    <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
+                    <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.school.id %>" /> <!-- 单位名称的test框选中下拉列表框的id -->
                 <% end %>
                 <p class="fl ml10">
                   <!-- <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span> -->
@@ -605,12 +607,15 @@
     });
   });
 
+// 基本资料页面提交表单时，判断身份与单位是否合法
 function my_account_form_submit(){
     if($("#userIdentity").val() == -1 ) {
         $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
-        e.stopImmediatePropagation();
+        e.stopImmediatePropagation(); // 阻止事件冒泡
         return;
     }
+
+    // 单位或高校必须从下拉列表中选择
     if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
         $("#hint").html('<span style="color:red">单位名称必须是从下拉列表中选择的,不能手动修改</span>').show();
         e.stopImmediatePropagation();

app/views/org_member/create.js.erb

@@ -1,8 +1,9 @@
 <% if @fail_hint %>
     alert("<%= @fail_hint %>");
 <% else %>
-    $("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
+    // 组织添加成员后，同步刷新成员列表，左侧成员数
+    $("#org_member_list").html('<%= escape_javascript( render :partial => "organizations/org_member_list", :locals => {:members => @members}) %>');
     $("#principals_for_new_member").html('');
-    $("#org_members_count_id").html("<%= @org.org_members.count %>");
+    $("#org_members_count_id").html("<%= @organization.org_members.count %>");
     $("#not_org_member_search").val("");
 <% end %>

app/views/org_member/deleteOrgMember.js.erb

@@ -1,3 +1,4 @@
+// 删除成员后，同步刷新成员列表与左侧成员显示数
 $("#org_members_count_id").html("");
-$("#org_members_count_id").html("<%= @org.org_members.count %>")
-$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
+$("#org_members_count_id").html("<%= @organization.org_members.count %>");
+$("#org_member_list").html('<%= escape_javascript( render :partial => "organizations/org_member_list", :locals=> {:members => @members}) %>');

app/views/org_member/destroy.js.erb

@@ -1,3 +1,4 @@
+// 组织成员删除后，同步刷新成员数和成员列表
 $("#org_members_count_id").html("");
-$("#org_members_count_id").html("<%= @org.org_members.count %>")
-$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
+$("#org_members_count_id").html("<%= @organization.org_members.count %>");
+$("#org_member_list").html('<%= escape_javascript( render :partial => "organizations/org_member_list", :locals => {:members => @members}) %>');