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

Conflicts:
	db/schema.rb

app/controllers/boards_controller.rb

@@ -101,8 +101,9 @@ class BoardsController < ApplicationController
         @topic_count = @board ? @board.topics.count : 0
         if @project
           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+          #现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
           @topics =  @board.topics.
-              reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
+              reorder("#{Message.table_name}.created_on desc").
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).

app/controllers/forums_controller.rb

@@ -296,7 +296,7 @@ class ForumsController < ApplicationController
 
   #检查forum的名字
   def check_forum_name
-    forum_name_exist = Forum.where("name = '#{params[:forum_name]}'").count >= 1 ? true : false
+    forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
     render :text => forum_name_exist
   end
 

app/controllers/journals_controller.rb

@@ -73,7 +73,7 @@ class JournalsController < ApplicationController
     text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
     @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n"
     @content << text.gsub(/(\r?\n|\r\n?)/, "\n ") + "\n"
-    @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content << "</blockquote>"
+    @content = "<blockquote style='padding-left:0px;margin-left:0px;'>" << @content << "</blockquote>\n\n<br/>"
     @id = user.id
   rescue ActiveRecord::RecordNotFound
     render_404

app/controllers/messages_controller.rb

@@ -160,6 +160,7 @@ class MessagesController < ApplicationController
     @reply.safe_attributes = params[:reply]
     @reply.content = @quote + @reply.content
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+    # @reply.reply_id = params[:id]
     @topic.children << @reply
     course_activity = CourseActivity.where("course_act_type='Message' and course_act_id =#{@topic.id}").first
     course_activity.updated_at = Time.now

app/controllers/projects_controller.rb

@@ -189,6 +189,7 @@ class ProjectsController < ApplicationController
     @project.organization_id = params[:organization_id]
     @project.user_id = User.current.id
     @project.project_new_type = params[:project_new_type]
+    params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
     if validate_parent_id && @project.save
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
       # Add current user as a project member if he is not admin

app/controllers/student_work_controller.rb

@@ -75,7 +75,7 @@ class StudentWorkController < ApplicationController
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @homework_commons = @course.homework_commons.order("created_at desc")
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    @is_evaluation = @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
+    @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false
 
     course_group = CourseGroup.find_by_id(@group) if @group
@@ -86,7 +86,7 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      if @is_teacher   #老师 || 超级管理员 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
@@ -106,7 +106,7 @@ class StudentWorkController < ApplicationController
         @stundet_works = []
       end
     else
-      if @is_teacher   #老师 || 超级管理员 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的

app/helpers/api_helper.rb

@@ -75,7 +75,7 @@ module ApiHelper
   # 学生获取课程作业的状态
   def get_homework_status homework
     homework_status = ""
-       if !homework.nil?
+       if homework
          if  homework.homework_type == 1 && homework.homework_detail_manual
            case homework.homework_detail_manual.comment_status
              when 1

app/helpers/application_helper.rb

@@ -2299,7 +2299,7 @@ module ApplicationHelper
   def homework_anonymous_comment homework
     if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
-    elsif homework.student_works.count >= 2 #作业份数大于2
+    elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
         link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
@@ -2309,7 +2309,7 @@ module ApplicationHelper
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
     else
-      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于2时才可以启动匿评"
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于等于2时才可以启动匿评"
     end
     link
   end
@@ -2356,8 +2356,8 @@ module ApplicationHelper
       if work.nil?
         link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
       else
-        if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+          link_to "作品已交",  "javascript:void(0)", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
           link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else

app/helpers/users_helper.rb

@@ -464,7 +464,7 @@ module UsersHelper
     no_html = "message"
     arr = details_to_strings(journal.details, no_html)
     unless journal.notes.blank?
-      arr << "留言内容：" + journal.notes
+      arr << journal.notes
     end
     str = ''
     arr.each { |item| str = str+item }
@@ -582,7 +582,7 @@ module UsersHelper
     option << "请选择发布作业的课程"
     option << -1
     type << option
-    user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
+    user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
       option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id

app/models/homework_detail_programing.rb

@@ -4,6 +4,6 @@ class HomeworkDetailPrograming < ActiveRecord::Base
   belongs_to :homework_common
 
   def language_name
-    %W(C C++ Python).at(self.language.to_i - 1)
+    %W(C C++ Python Java).at(self.language.to_i - 1)
   end
 end

app/models/mailer.rb

@@ -71,7 +71,7 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     course.student.each do |student|
       user = User.find(student.student_id)
-      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
@@ -255,7 +255,7 @@ class Mailer < ActionMailer::Base
   # 作业截止时间邮件提醒
   def homework_endtime__added(homework_common, user_id)
     user = User.find(user_id)
-    @subject = "#{l(:mail_homework)}#{homework_common.name}#{l(:mail_homework_endtime)} "
+    @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_homework_endtime)} "
     @token = Token.get_token_from_user(user, 'autologin')
     @homework_endtime_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
     @homework_endtime_name = homework_common.name

app/models/message.rb

@@ -86,7 +86,7 @@ class Message < ActiveRecord::Base
   }
 
 
-  safe_attributes 'subject', 'content'
+  safe_attributes 'subject', 'content', 'reply_id'
   safe_attributes  'board_id','locked', 'sticky',
     :if => lambda {|message, user|
       if message.project

app/views/boards/_project_show.html.erb

@@ -51,9 +51,9 @@
                            :data => {:confirm => l(:text_are_you_sure)},
                            :class => 'talk_edit fr',
                            :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
-                <% if topic.sticky? %>
-                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
-                <% end %>
+                <%# if topic.sticky? %>
+                  <!--<a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%#= l(:label_board_sticky)%></a>-->
+                <%# end %>
                 <script>
                     //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
                     //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug

app/views/files/_tag_yun.html.erb

@@ -3,7 +3,7 @@
         <% if tag_name && tag_name == k%>
             <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
         <% else%>
-            <a href="javascript:void(0);" class="files_tag_icon" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a>
+        <span class="files_tag_icon">    <a href="javascript:void(0);"  ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>
     <% end%>
 <% end%>

app/views/files/index.html.erb

@@ -223,6 +223,7 @@
                 });
 
     }
+    <% if @course %>
     var tagNameHtml; //当前双击的链接的父节点的html
     var tagName;  //标签的值
     var parentCssBorder; //当前双击的链接的父节点
@@ -271,6 +272,7 @@
                }
            }
    });
+   <%end %>
 
 </script>
 

app/views/forums/_file_form.html.erb

@@ -47,7 +47,7 @@
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
     <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %>
-    <a href="javascript:void(0);" onclick="$('#_file').click();" class="AnnexBtn fl mr15">上传附件</a>
+    <a href="javascript:void(0);" onclick="_file.click();" class="AnnexBtn fl mr15">上传附件</a>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
                        :class => 'file_selector',

app/views/forums/_form_edit_mode.html.erb

@@ -9,10 +9,10 @@
       <div id="error" style="display: none;color: red;">
       </div>
       <div>
-        <textarea type="text" id="forum_name" name="forum[name]" class="postCreateInput" placeholder="对应贴吧名称"  ><%= @forum.name.html_safe%></textarea>
+        <textarea type="text" id="forum_name" name="forum[name]" maxlength="50" class="postCreateInput" placeholder="对应贴吧名称"  ><%= @forum.name.html_safe%></textarea>
       </div>
       <div class="mt15">
-        <textarea type="text" id="forum_desc" name="forum[description]" class="postCreateInput" placeholder="对应贴吧描述" ><%= @forum.description.html_safe%></textarea>
+        <textarea type="text" id="forum_desc" name="forum[description]" maxlength="5000" class="postCreateInput" placeholder="对应贴吧描述" ><%= @forum.description.html_safe%></textarea>
       </div>
       <div class="mt10">
         <div class="fr"><a href="javascript:void(0);" class="submit_btn" onclick="check_and_submit($(this));">确定</a></div>

app/views/forums/_forum_list.html.erb

@@ -10,7 +10,7 @@
                 <!--<a href="javascript:void(0);" class="f16 linkBlue">新手讨论吧</a>-->
                 <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-              <div class="postDes"><%= textAreailizable forum.description%></div>
+              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;"><%= textAreailizable forum.description%></div>
               <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>

app/views/forums/_forum_tag_list.html.erb

@@ -1,6 +1,6 @@
 <% forum.tag_list.each do |tag|%>
     <span class="postlabel mr10">
-                <a href="javascript:void(0);" ondblclick="rename_tag($(this),<%= tag %>,<%= forum.id%>,5);" class="fontGrey2 mr5"><%= tag %></a>
+                <a href="javascript:void(0);" ondblclick="rename_tag($(this),<%= tag %>,<%= forum.id%>,5);" style="cursor: default" class="fontGrey2 mr5"><%= tag %></a>
       <%if forum.creator.id == User.current.id%>
                 <a href="javascript:void(0);" class="fontGrey2" onclick="delete_forum_tag($(this));">×</a>
        <% end %>

app/views/forums/edit.html.erb

@@ -1,23 +1,7 @@
 
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'new_user' %>
 <script>
-    $(function(){
-        document.getElementById('forum_name').onkeydown = function()
-        {
-            var n = 0;
-            var str = this.value;
-            for (i = 0; i < str.length; i++) {
-                var leg = str.charCodeAt(i);//ASCII码
-                if (leg > 255) {
-                    n += 2;
-                } else {
-                    n += 1;
-                }
-            }
-            if(n >= 160)
-                event.returnValue = false;
-        }
-    })
+
 
     function check_and_submit(doc){
         $("#error").html('').hide();
@@ -43,13 +27,10 @@
     function check_forum_name(){
         check_pass = true;
         name = $("textarea[name='forum[name]']").val().trim();
-        if(name == '<%= @forum.name%>'){
-            return;
-        }
         if( name != ""){
             $.get(
                     '<%= check_forum_name_forums_path %>',
-                    {"forum_name":name},
+                    {"forum_name":name,"forum_id":<%= @forum.id%>},
                     function(data){
 
                         if( data == 'true'){
@@ -69,4 +50,29 @@
     autoTextarea(textarea);
     var textarea1 = document.getElementById('forum_desc');
     autoTextarea(textarea1);
+    $(function(){
+        $('#forum_name').keypress(function(e)
+        {
+            var n = 0;
+            var str = this.val().trim();
+            for (i = 0; i < str.length; i++) {
+                var leg = str.charCodeAt(i);//ASCII码
+                if (leg > 255) {
+                    n += 2;
+                } else {
+                    n += 1;
+                }
+            }
+            if(n >= 160 && e.keyCode != 8)
+                if(document.all)
+                {
+                    e.returnValue = false;
+                }
+                else
+                {
+                    e.preventDefault();
+                }
+
+        })
+    })
 </script>

app/views/forums/index.html.erb

@@ -49,10 +49,11 @@
           $("#reorder_popu").removeClass("sortArrowActiveD");
           add_class("reorder_time");
       });
-      document.getElementById('forum_name').onkeydown = function()
+      $('#forum_name').keypress( function(e)
       {
+          alert(1)
           var n = 0;
-          var str = this.value;
+          var str = this.val().trim();
           for (i = 0; i < str.length; i++) {
               var leg = str.charCodeAt(i);//ASCII码
               if (leg > 255) {//大于255的都是中文
@@ -61,9 +62,17 @@
                   n += 1;//英文，不多说了
               }
           }
-          if(n >= 160 && event.keyCode != 8)
-              event.returnValue = false;
-      }
+          console.log(n)
+          if(n >= 160 && e.keyCode != 8)
+              if(document.all)
+              {
+                  e.returnValue = false;
+              }
+              else
+              {
+                  e.preventDefault();
+              }
+      })
   });
   function check_and_submit(doc){
       $("#error").html('').hide();
@@ -129,14 +138,14 @@
        <div class="red fl mb10" id="error" style="display: none">error</div>
        <%= form_tag({:controller => 'forums',:action=>'create',:format=>'js'},:method => 'post',:remote=>'true') do  |f| %>
        <div class="mt15">
-         <textarea type="text" name="forum[name]"  id="forum_name"  class="postCreateInput" onfocus="hideError();" onblur="check_forum_name();" placeholder="输入贴吧名称"  ></textarea>
+         <textarea type="text" name="forum[name]"  id="forum_name" maxlength="80"  class="postCreateInput" onfocus="hideError();" onblur="check_forum_name();" placeholder="输入贴吧名称"  ></textarea>
          <script>
            var textarea = document.getElementById('forum_name');
                autoTextarea(textarea);
          </script>
        </div>
        <div class="mt15">
-         <textarea type="text" name="forum[description]" id="forum_desc" class="postCreateInput"  placeholder="输入贴吧描述"></textarea>
+         <textarea type="text" name="forum[description]" id="forum_desc" maxlength="5000" class="postCreateInput"  placeholder="输入贴吧描述"></textarea>
          <script>
              var textarea1 = document.getElementById('forum_desc');
              autoTextarea(textarea1);

app/views/forums/show.html.erb

@@ -92,14 +92,14 @@
     <div id="error" class="red fl mb10" style="display: none">error</div>
     <%= labelled_form_for(@memo, :url => forum_memos_path(@forum)) do |f|  %>
     <div>
-      <textarea type="text" name="memo[subject]" id="memo_subject" onblur="check_memo_name();" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子标题"  ></textarea>
+      <textarea type="text" name="memo[subject]" id="memo_subject" maxlength="50" onblur="check_memo_name();" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子标题"  ></textarea>
       <script>
           var textarea1 = document.getElementById('memo_subject');
           autoTextarea(textarea1);
       </script>
     </div>
     <div class="mt15">
-      <textarea type="text" name="memo[content]" id="memo_content"  onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子内容" /></textarea>
+      <textarea type="text" name="memo[content]" id="memo_content"  maxlength="5000" onfocus="$('#error').hide();" onmouseover="this.style.borderColor='#d9d9d9'" class="postDetailInput" placeholder="输入帖子内容" /></textarea>
       <script>
           var textarea = document.getElementById('memo_content');
           autoTextarea(textarea);

app/views/issues/_action_menu.html.erb

@@ -3,4 +3,4 @@
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
 <%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
-<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>
+<%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_journal_kind_reply"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>

app/views/issues/_edit.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
@@ -19,7 +20,7 @@
     </div>
     <input name="issue_quote_new" type="hidden" value="<%= %>" />
     <fieldset><legend>回复</legend>
-    <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
+    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply' %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
     <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->

app/views/issues/_history.html.erb

@@ -12,9 +12,9 @@
             <p>
               <% if journal.details.any? %>
                 <% details_to_strings(journal.details).each do |string| %>
-                  <p><%= string %></p>
+                  <p><%= string.html_safe %></p>
                 <% end %>
-            <% end %>
+              <% end %>
             </p>
           </div>
           <!--编辑、引用、回复按钮-->