Merge branch 'szzh' into cxt_course

app/controllers/repositories_controller.rb

@@ -31,8 +31,8 @@ class RepositoriesController < ApplicationController
   default_search_scope :changesets
 
   before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo]
-  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked]
-  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab]
+  before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
+  before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
   before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
   accept_rss_auth :revisions
@@ -64,6 +64,8 @@ class RepositoriesController < ApplicationController
   end
 
   def forked
+    @project = Project.find(params[:id])
+    @repository = Repository.where("project_id =? and type =?", @project.id, "Repository::Gitlab")
     # 如果当前用户已经fork过该项目，不会新fork项目，则跳至已fork的项
     unless has_forked?(@project, User.current)
       project = project_from_current_project(@project.id, User.current.id)
@@ -76,7 +78,11 @@ class RepositoriesController < ApplicationController
       else
         g = Gitlab.client
         if User.current.gid.nil?
-          g.sync_user(User.current)
+          begin
+            g.sync_user(User.current)
+          ensure
+            logger.error "Synv user failed ==>#{User.current.id}"
+          end
         end
         gproject = g.fork(@project.gpid, User.current.gid)
         if gproject

app/controllers/student_work_controller.rb

@@ -649,7 +649,8 @@ class StudentWorkController < ApplicationController
     if revise_attachments.count == 2
       revise_attachments.last.destroy
     end
-    #@attachment = @work.attachments.where("attachtype = 7").order("created_on desc").first
+    attachment = @work.attachments.where("attachtype = 7").first
+    attachment.update_attributes(:description => params[:description])
     respond_to do |format|
       format.js
     end

app/controllers/zipdown_controller.rb

@@ -1,4 +1,8 @@
-require 'zip'
+#coding=utf-8
+
+require "base64"
+require 'zip'
+
 class ZipdownController < ApplicationController
   #查找项目（课程）
   before_filter :find_project_by_bid_id, :only => [:assort]
@@ -11,7 +15,13 @@ class ZipdownController < ApplicationController
   def download
     if User.current.logged?
       begin
-        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
+        if params[:base64file]
+          file = Base64.decode64(params[:base64file])
+          file = file.sub('*', '+')
+          send_file "#{OUTPUT_FOLDER}/#{file}", :filename => filename_for_content_disposition(file), :type => detect_content_type(file)
+        else
+          send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file])
+        end
       rescue => e
         render file: 'public/no_file_found.html'
       end
@@ -107,11 +117,17 @@ class ZipdownController < ApplicationController
               bid_homework_path, OUTPUT_FOLDER)
     }
     [{files:[out_file.file_path], count: 1, index: 1,
-      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
+      real_file: out_file.file_path,
+      file: File.basename(out_file.file_path),
+      base64file: encode64(File.basename(out_file.file_path)),
       size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
      }]
   end
 
+  def encode64(str)
+    Base64.encode64(str).sub('+', '*')
+  end
+
   def zip_homework_common homework_common
     bid_homework_path = []
     digests = []
@@ -129,7 +145,9 @@ class ZipdownController < ApplicationController
               bid_homework_path, OUTPUT_FOLDER)
     }
     [{files:[out_file.file_path], count: 1, index: 1,
-      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
+      real_file: out_file.file_path,
+      file: File.basename(out_file.file_path),
+      base64file: encode64(File.basename(out_file.file_path)),
       size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
      }]
   end

app/helpers/application_helper.rb

@@ -253,8 +253,10 @@ module ApplicationHelper
         subject = truncate(subject, :length => 60)
       end
     end
-    if issue.status_id == 5
+    if issue.status_id == 3
       s = link_to text, issue_path(issue), :class => "text_line_s", :title => title
+    elsif issue.status_id == 5
+      s = link_to text, issue_path(issue), :class => "text_line_s del_line", :title => title
     else
       s = link_to text, issue_path(issue), :class => "c_blue", :title => title
     end

app/models/mailer.rb

@@ -394,7 +394,7 @@ class Mailer < ActionMailer::Base
     @issue = issue
     user = User.find_by_mail(recipients)
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
+    # @token = Token.get_token_from_user(user, 'autologin')
     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
 
     # edit
@@ -436,15 +436,15 @@ class Mailer < ActionMailer::Base
 
     user = User.find_by_mail(recipients)
     @user = user
-    @token = Token.get_token_from_user(user, 'autologin')
+    # @token = Token.get_token_from_user(user, 'autologin')
 
 
     # edit
-    @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id,  :token => @token.value)
-    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
-    @user_url = url_for(my_account_url(user,:token => @token.value))
+    @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id)
+    @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id)
+    @user_url = url_for(my_account_url(user))
 
-    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
+    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}")
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject

app/models/user.rb

@@ -344,7 +344,8 @@ class User < Principal
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
     system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count
-    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count
+    at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count
+    messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count
   end
 
   # 查询指派给我的缺陷记录

app/views/blog_comments/_blog_attachments.erb

@@ -57,7 +57,7 @@
                                :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
                                :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
                                :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js', :project => container),
+                               :upload_path => uploads_path(:format => 'js'),
                                :description_placeholder => l(:label_optional_description),
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),

app/views/forums/_file_form.html.erb

@@ -58,7 +58,7 @@
                                :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
                                :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
                                :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                               :upload_path => uploads_path(:format => 'js', :project => project),
+                               :upload_path => uploads_path(:format => 'js'),
                                :description_placeholder => l(:label_optional_description),
                                :field_is_public => l(:field_is_public),
                                :are_you_sure => l(:text_are_you_sure),

app/views/issues/_list.html.erb

@@ -41,7 +41,7 @@
  <% end %>
  <% if issues.count == 10%>
      <!--<div id="show_more_issues" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>-->
-     <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+     <%= link_to "点击展开更多",project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "show_more_issues",:remote => "true",:class => "loadMore mt10 f_grey"%>
  <% end%>
  <!--<ul class="wlist">-->
    <!--<%#= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>-->

app/views/layouts/_footer.html.erb

@@ -12,24 +12,28 @@
 
   <div class="cl"></div>
   <ul class="departments">
-    <li class="fl mr10">
-      <strong><%= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%= l(:label_hosted_by)%></a>
+    <!--li class="fl mr10">
+      <strong><%#= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%#= l(:label_hosted_by)%></a>
     </li>
     <li class="fl">
-      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%= l(:label_sponsor)%></a>
-    </li>
+      <a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%#= l(:label_sponsor)%></a>
+    </li-->
     <li class="fl mr10">
-      <strong><%= l(:label_partners)%></strong><a href="http://eecs.pku.edu.cn" class="ml10 f_grey" target="_blank"><%= l(:label_co_organizer_EECS)%></a>
+      <strong><%= l(:label_partners)%></strong>
     </li>
-    <li class="fl">
-      <a href="http://scse.buaa.edu.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_BHU)%></a>
+    <li class="fl mr20">
+      <a href="http://eecs.pku.edu.cn" class="f_grey" target="_blank"><%#= l(:label_co_organizer_EECS)%><img src="/images/footer_logo/PekingUniversity.png" width="121" height="40" style="display: inline-block;" alt="北京大学" /></a>
     </li>
-    <li class="fl">
-      <a href="http://www.iscas.ac.cn/" class="mr10 f_grey" target="_blank"><%= l(:label_co_organizer_CAS)%></a>
+    <li class="fl mr20">
+      <a href="http://scse.buaa.edu.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_BHU)%><img src="/images/footer_logo/BeiHang_university.png" width="173" height="40" style="display: inline-block;" alt="北京航空航天大学" /></a>
     </li>
-    <li class="fl">
-      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%= l(:label_co_organizer_InforS)%></a>
+    <li class="fl mr20">
+      <a href="http://www.iscas.ac.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_CAS)%><img src="/images/footer_logo/ISCAS_logo.png" width="91" height="40" style="display: inline-block;" alt="ISCAS" /></a>
+    </li>
+    <li class="fl mr20">
+      <a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_InforS)%><img src="/images/footer_logo/CVICSE.png" width="165" height="40" style="display: inline-block;" alt="中创软件" /></a>
     </li>
+    <li class="fl"><a href="http://www.webxmf.com/" target="_blank"><img src="/images/footer_logo/bee_logo.png" width="167" height="40" style="display: inline-block;" alt="web小蜜蜂" /></a></li>
   </ul>
   <div class="cl"></div>
   <ul class="copyright">

app/views/mailer/issue_add.html.erb

@@ -6,7 +6,7 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
     <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
     <% end %>
 </div>

app/views/mailer/issue_add.text.erb

@@ -4,6 +4,6 @@
   <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
   <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
   <% end %>
 <% end %>

app/views/mailer/issue_edit.html.erb

@@ -9,7 +9,7 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
     <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
     <% end %>
 </div>

app/views/mailer/issue_edit.text.erb

@@ -9,6 +9,6 @@
   <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
     <label style="margin-top:20px;color:gray; margin-left:10px;"><%= l(mail_option) %></label>
   <% else %>
-    <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+    <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
   <% end %>
 <% end %>

app/views/mailer/send_for_user_activities.text.erb

@@ -6,11 +6,11 @@
         <%= l(:label_course_news) %>
         <% @course_news.each do |course_new|%>
 
-            ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%> ]
+            ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course)%> ]
 
-            <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value) %>
+            <%= link_to course_new.author, user_activities_url(course_new.author) %>
             <%= l(:label_project_notice) %>
-            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) %>
+            <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new) %>
             <%= format_time(course_new.created_on) %>
         <% end %>
     <% end %>
@@ -19,12 +19,12 @@
         <%= l(:label_course_news) %>
         <% @course_news_comments.each do |course_news_comment|%>
             ▪[ <% unless course_news_comment.commented.nil? %>
-                <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value) %>
+                <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course) %>
             <% end %>
             ]
-            <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %>
+            <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author) %>
             <%= l(:label_project_notice_reply) %>
-            <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %>
+            <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented) %>
             <%= format_time(course_news_comment.created_on) %>
         <% end %>
     <% end %>
@@ -33,10 +33,10 @@
         <%= l(:label_homework_overview) %>
         <% unless @bids.first.nil?%>
             <% @bids.each do |bid| %>
-                ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value) %>]
-                <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value) %>
+                ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course) %>]
+                <%= link_to bid.user, user_activities_url(bid.user) %>
                 <%= l(:label_course_homework) %>
-                <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value) %>
+                <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id) %>
                 <%= format_time(bid.created_at) %>
             <% end %>
         <% end %>
@@ -46,10 +46,10 @@
     <% unless @course_journal_messages.first.nil? %>
         <%= l(:view_course_journals_for_messages) %>
         <% @course_journal_messages.each do |course_journal_message|%>
-            [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) %>]
-            <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %>
+            [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course) %>]
+            <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %>
+            <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course) %>
             <%= format_time(course_journal_message.created_on) %>
         <% end %>
     <% end %>
@@ -57,10 +57,10 @@
     <% unless @course_messages.first.nil? %>
         <%= l(:view_borad_course) %>
         <% @course_messages.each do |course_message|%>
-            ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)%>]
-            <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course)%>]
+            <%= link_to course_message.author, user_activities_url(course_message.author) %>
             <%= l(:label_send_course_messages) %>
-            <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value) %>
+            <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id) %>
             <%= format_time(course_message.created_on) %>
         <% end %>
     <% end %>
@@ -68,10 +68,10 @@
     <% unless @attachments.first.nil? %>
         <%= l(:label_course_mail_files) %>
         <% @attachments.each do |attachment|%>
-            ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) %>]
-            <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course) %>]
+            <%= link_to attachment.author, user_activities_url(attachment.author) %>
             <%= l(:label_course_file_upload) %>
-            <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value) %>
+            <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course) %>
             <%= format_time(attachment.created_on) %>
         <% end %>
         <!--课件下载  end-->
@@ -86,10 +86,10 @@
     <% unless @issues.first.nil? %>
         <%= l(:label_issue_tracking) %>
         <% @issues.each do |issue|%>
-            ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value) %>]
-            <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project) %>]
+            <%= link_to issue.author, user_activities_url(issue.author) %>
             <%= l(:label_project_issue) %>
-            <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+            <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue) %>
             <%= format_time(issue.created_on) %>
         <% end %>
         <!--问题跟踪 end-->
@@ -99,13 +99,13 @@
     <% unless @issues_journals.first.nil? %>
         <%= l(:label_issue_tracking) %>
         <% @issues_journals.each do |issues_journal| %>
-            ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value) %>]
-            <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value) %>
+            ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project) %>]
+            <%= link_to issues_journal.user, user_activities_url(issues_journal.user) %>
             <%= l(:label_project_issue_update) %>
             <% if issues_journal.notes.nil? %>
-                <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue) %>
             <% else %>
-                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue,  :token => @token.value) %>
+                <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue) %>
             <% end %>
             <%= format_time(issues_journal.created_on) %>
         <% end %>
@@ -115,10 +115,10 @@
     <% unless @project_messages.first.nil? %>
         <%= l(:project_moule_boards_show) %>
         <% @project_messages.each do |project_message|%>
-            ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value) %>]
-            <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project) %>]
+            <%= link_to project_message.author, user_activities_url(project_message.author) %>
             <%= l(:label_send_course_messages) %>
-            <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value) %>
+            <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id) %>
             <%= format_time(project_message.created_on) %>
         <% end %>
         <!--项目论坛 end-->
@@ -129,13 +129,13 @@
         <%= l(:label_wiki) %>
         <% @wiki_contents.each do |wikicontent|%>
             ▪[<% unless wikicontent.page.nil? %>
-                <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value) %>
+                <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project) %>
             <% end %>
             ]
-            <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %>
+            <%= link_to wikicontent.author, user_activities_url(wikicontent.author) %>
             <%= l(:label_wiki_mail_notification) %>
             <% unless wikicontent.page.nil? %>
-                <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value) %>
+                <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki) %>
             <% end %>
             <%= format_time(wikicontent.updated_on) %>
         <% end %>
@@ -145,10 +145,10 @@
     <% unless @project_news.first.nil? %>
         <%= l(:label_project_news) %>
         <% @project_news.each do |project_new|%>
-            ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) %> ]
-            <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project) %> ]
+            <%= link_to project_new.author, user_activities_url(project_new.author) %>
             <%= l(:label_project_mail_notice) %>
-            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %>
+            <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new) %>
             <%= format_time(project_new.created_on) %>
         <% end %>
     <% end %>
@@ -158,11 +158,11 @@
         <%= l(:label_project_news) %>
         <% @project_news_comments.each do |project_news_comment|%>
             ▪[ <% unless project_news_comment.commented.nil? %>
-                <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value) %>
+                <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project) %>
             <% end %>]
-            <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %>
+            <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author) %>
             <%= l(:lable_project_mail_notice_reply) %>
-            <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value) %>
+            <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented) %>
             <%= format_time(project_news_comment.created_on) %>
         <% end %>
         <!-- 项目新闻回复end -->
@@ -172,10 +172,10 @@
     <% unless @project_attachments.first.nil? %>
         <%= l(:label_project_mail_attachments) %>
          <% @project_attachments.each do |project_attachment|%>
-              ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value) %>]
-              <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value) %>
+              ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project) %>]
+              <%= link_to project_attachment.author, user_activities_url(project_attachment.author) %>
               <%= l(:label_project_mail_upload) %>
-              <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value) %>
+              <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project) %>
               <%= format_time(project_attachment.created_on) %>
           <% end %> <!-- 项目上传资源  end-->
     <% end %>
@@ -184,10 +184,10 @@
     <% unless @project_journal_messages.first.nil? %>
         <%= l(:label_project_mail_feedback) %>
         <% @project_journal_messages.each do |project_journal_message|%>
-            ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value) %> ]
-            <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value) %>
+            ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project) %> ]
+            <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user) %>
             <%= l(:label_send_course_journals_for_messages) %>
-            <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value) %>
+            <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project) %>
             <%= format_time(project_journal_message.created_on) %>
         <% end %>
         <!--项目留言 end-->
@@ -202,9 +202,9 @@
     <%= l(:label_user_message) %>
     (<%= @user_journal_messages.count %>)
     <% @user_journal_messages.each do |user_journal_message|%>
-        ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)%>
+        ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user)%>
         <%= l(:label_show_your_message) %>
-        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %>
+        <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user) %>
         <%= format_time(user_journal_message.created_on) %>
     <% end %>
 <% end %>
@@ -214,9 +214,9 @@
     <% unless @forums.first.nil? %>
         <%= l(:label_user_forum) %>
         <% @forums.each do |forum|%>
-            ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
+            ▪<%= link_to forum.creator, user_activities_url(forum.creator) %>
             <%= l(:label_forum_new) %>
-            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %>
+            <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum) %>
             <%= format_time(forum.created_at) %>
         <% end %>
         <!-- 新建贴吧 end-->
@@ -224,7 +224,7 @@
     <% unless @memos.first.nil? %>
         <%= l(:label_user_message_forum) %>
         <% @memos.each do |memo|%>
-            ▪<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
+            ▪<%= link_to memo.author, user_activities_url(memo.author)%>
             <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
             <%= link_to truncate(memo.subject.html_safe,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%>
             <%= format_time(memo.created_at) %>
@@ -238,6 +238,6 @@
     <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %>
         <%= l(mail_option) %>
     <% else %>
-        <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
+        <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %>
     <% end %>
 <% end %>

app/views/memos/edit.html.erb

@@ -21,10 +21,7 @@
           $.ajax({
               url:' /forums/'+'<%= @memo.forum_id.to_s %>'+'/memos/<%= @memo.id.to_s%>',
               type:'put',
-              data:{
-                'memo[subject]':$("#memo_subject").val(),
-                 'memo[content]':$("#memo_content").val()
-              },
+              data:$("#edit_memo").serialize(),
               success:function(data){
 
               },

app/views/my/account.html.erb

@@ -18,8 +18,8 @@
           <li>登录名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li>邮箱&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li>身份&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">性别&nbsp;:&nbsp;</li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">工作单位&nbsp;:&nbsp;</li>

app/views/organizations/_join_project_menu.html.erb

@@ -29,7 +29,7 @@
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_projects', :organization_id => organization_id),:method => 'post', :id => 'join_projects_form', :remote => true,:class=>"resourcesSearchBox" do %>
         <input type="text" name="projects" placeholder="搜索您已加入的项目的名称" class="searchCourse" />
-        <div id="search_projects_result_list" class="mb8"></div>
+        <div id="search_projects_result_list" class="mb8 maxHeight100"></div>
         <div class="courseSendSubmit">
           <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
         </div>

app/views/repositories/show.html.erb

@@ -41,7 +41,7 @@
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>
             <% else %>
-                 <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                 <span class="fl"><div class="fb fontGrey3 rep_mail_name mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
                     <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
                     <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
                 </span>

app/views/student_work/_programing_work_show.html.erb

@@ -115,8 +115,20 @@
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
-    function submit_files(){
-        $("#upload_form").submit();
+    function regex_des() {
+        if ($.trim($("#attachment_des").val()) == "") {
+            $("#hint_message").text("附件描述不能为空");
+            $("#hint_message").css('color','#ff0000');
+            return false;
+        } else {
+            $("#hint_message").text("");
+            return true;
+        }
+    }
+    function submit_revise_files(){
+        if (regex_des()) {
+            $("#upload_form").submit();
+        }
     }
     function closeModal(){
         hideModal($(".uploadBoxContainer"));

app/views/student_work/_revise_attachment.html.erb

@@ -7,8 +7,12 @@
         <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
           <span class="tit_fb"> 追加附件：</span>
           <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
-          <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)
+          <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)<br />
+          <% unless revise_attachment.description == "" %>
+            <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+          <% end %>
         </div>
+        <div class="cl"></div>
     <% end %>
     <% if work.user == User.current %>
         <div class="resubAtt mb15">
@@ -18,10 +22,14 @@
             <div class="mb10" id="revise_attachment_div_<%=revise_attachment.id %>">
               <span class="tit_fb"> 追加附件：</span>
               <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
-              <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>
+              <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %><br />
+              <% unless revise_attachment.description == "" %>
+                  <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+              <% end %>
             </div>
         <% end %>
-        <div class="mb10">
+        <div class="cl"></div>
+        <div class="mb10 mt5">
           <a href="javascript:void(0);" onclick="show_upload();" class="blueCir ml5" title="请选择文件上传">上传附件</a>
         </div>
     <% end %>

app/views/student_work/_show.html.erb

@@ -113,8 +113,20 @@
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }
-    function submit_files(){
-        $("#upload_form").submit();
+    function regex_des() {
+        if ($.trim($("#attachment_des").val()) == "") {
+            $("#hint_message").text("附件描述不能为空");
+            $("#hint_message").css('color','#ff0000');
+            return false;
+        } else {
+            $("#hint_message").text("");
+            return true;
+        }
+    }
+    function submit_revise_files(){
+        if (regex_des()) {
+            $("#upload_form").submit();
+        }
     }
     function closeModal(){
         hideModal($(".uploadBoxContainer"));

app/views/student_work/_upload_attachment.html.erb

@@ -9,7 +9,7 @@
       </div>
       <div class="uploadBox" id="uploadReviseBox">
         <input type="hidden" name="attachment_type" value="7">
-        <a href="javascript:void(0);" class="uploadIcon f14" name="button" id="choose_revise_attach"  onclick="_file.click();" onmouseover="" style="<%= ie8? ? 'display:none' : ''%>">
+        <a href="javascript:void(0);" class="uploadIcon f14" name="button" id="choose_revise_attach"  onclick="_file.click();" style="<%= ie8? ? 'display:none' : ''%>">
           <span class="chooseFile">选择文件</span></a>
         <%= file_field_tag 'attachments[dummy][file]',
                            :id => '_file',
@@ -37,9 +37,16 @@
         <div class="uploadResourceName">最多只能上传一个小于<span class="c_red">50MB</span>的附件</div>
       </div>
       <div class="cl"></div>
+      <div class="mt10">
+        <textarea class="reUploadDetail" id="attachment_des" name="description" placeholder="请在此输入您追加附件的理由（必填）"></textarea>
+      </div>
+      <div class="cl"></div>
+      <p id="hint_message"></p>
+      <div class="cl"></div>
       <div style="margin-top: 10px" >
         <div class="courseSendSubmit">
-          <%= submit_tag '确定',:onclick=>'submit_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
+          <a href="javascript:void(0);" id="upload_files_submit_btn" class="sendSourceText" onclick="submit_revise_files();">确定</a>
+          <%#= submit_tag '确定',:onclick=>'submit_revise_files();',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
         </div>
         <div class="courseSendCancel">
           <a href="javascript:void(0);" id="upload_files_cancle_btn" class="sendSourceText" onclick="closeModal();">取消</a>