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

app/controllers/student_work_controller.rb

@@ -103,10 +103,9 @@ class StudentWorkController < ApplicationController
           if result["status"].to_i != -2
             #result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
             #result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
-          end
-
             space_replace_1(result["results"].first['output'])
             space_replace_1(result["results"].first['result'])
+          end
 
           logger.debug  result
 

app/controllers/users_controller.rb

@@ -1820,9 +1820,38 @@ class UsersController < ApplicationController
     else
       @flag = false
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
+    end
     @type = params[:type]
     @limit = 25
     @path = user_resource_user_path(User.current, :type => @type)
@@ -1932,9 +1961,39 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
+    end
+    @status = params[:status]
     @type = params[:type]
     @limit = 25
     @path = user_resource_user_path(User.current, :type => @type)
@@ -2031,9 +2090,38 @@ class UsersController < ApplicationController
     else
       @flag=true
     end
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_project_ids = User.current.projects.map {|p| p.id}
     user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+    if(params[:type].blank? || params[:type] == "1") # 我的资源
-                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      if params[:status] == "2"
+        @attachments = get_course_resources(params[:id], user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources(params[:id], user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources(params[:id], @order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources(params[:id], @order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+      end
+    elsif params[:type] == "6" # 公共资源
+      if params[:status] == "2"
+        @attachments = get_course_resources_public( user_course_ids, @order, @score)
+      elsif params[:status] == "3"
+        @attachments = get_project_resources_public(user_project_ids, @order, @score)
+      elsif params[:status] == "4"
+        @attachments = get_attch_resources_public(@order, @score)
+      elsif params[:status] == "5"
+        @attachments = get_principal_resources_public(@order, @score)
+      else
+        # 公共资源库：所有公开资源或者我上传的私有资源
+        @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+      end
+    end
     @type = params[:type]
     @limit = 25
     @path = user_resource_user_path(User.current, :type => @type)

app/views/users/_course_file_form.html.erb

@@ -1,4 +1,5 @@
-<%= form_tag add_exist_file_to_course_user_path(user, :type => defined? type ? "6" : type ),:remote=>true,:id=>'course_list_form' do %>
+
+<%= form_tag add_exist_file_to_course_user_path(user, :type => defined?(type) ? type : "6" ),:remote=>true,:id=>'course_list_form' do %>
     <div>
       <%= hidden_field_tag(:send_id, send_id) %>
       <%= hidden_field_tag(:send_ids, send_ids) %>
@@ -15,6 +16,7 @@
         <% end %>
       </div>
     </div>
+    <div class="cl"></div>
     <div>
       <div class="courseSendSubmit">
         <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->

app/views/users/_course_message_form.html.erb

@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->

app/views/users/_course_news_form.html.erb

@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->

app/views/users/_org_file_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_org_user_path(user, :type => defined? type ? "6" : type),:remote=>true,:id=>'orgs_list_form' do %>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => defined?(type) ?  type : "6" ),:remote=>true,:id=>'orgs_list_form' do %>
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
     <div class="sectionWrap fl mr15">

app/views/users/_project_file_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag add_exist_file_to_project_user_path(user, :type => defined? type ? "6" : type), :remote => true, :id => 'projects_list_form' %>
+<%= form_tag add_exist_file_to_project_user_path(user, :type => defined?(type) ?  type : "6" ), :remote => true, :id => 'projects_list_form' %>
 <div>
   <%= hidden_field_tag(:send_id, send_id) %>
   <%= hidden_field_tag(:send_ids, send_ids) %>
@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->

app/views/users/_project_message_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag share_message_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
+<%= form_tag share_message_to_project_user_path(user), :remote => true, :id => 'projects_list_form' %>
 <div>
   <%= hidden_field_tag(:send_id, send_id) %>
   <%= hidden_field_tag(:send_ids, send_ids) %>
@@ -9,17 +9,19 @@
               <li class="" style="display:inline-block">
                 <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
               </li>
-              <li class="sendCourseName"><%= project.name%></li>
+              <li class="sendCourseName"><%= project.name %></li>
             </ul>
         <% end %>
+    <% end %>
   </div>
-        </div>
+</div>
-        <div>
+<div class="cl"></div>
+<div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-            <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
   </div>
-          <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+  <div class="courseSendCancel">
-        </div>
+    <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-        <div class="cl"></div>
+</div>
-    <% end %>
+<div class="cl"></div>

app/views/users/_project_news_form.html.erb

@@ -15,6 +15,7 @@
     <% end %>
   </div>
 </div>
+<div class="cl"></div>
 <div>
   <div class="courseSendSubmit">
     <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->

app/views/users/_send_homework_to_course.html.erb

@@ -1,4 +1,4 @@
-<div class="boxContainer">
+<div class="boxContainer" style="height: auto;">
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="cl"></div>
@@ -8,33 +8,9 @@
     <!--<input type="text" name="search" placeholder="输入课程ID或者名称搜索" class="subjectSearch fr" />-->
     <input type="text" id="search_course_input" value="<%= @search %>"  name="search" placeholder="输入课程ID或者名称搜索" class="mt10 mb10 course-search" />
   </div>
-  <%= form_tag send_homework_to_course_user_path(user),:remote=>true,:id=>'choose_course_list_form' %>
+  <div id="send_homework_to_course_form">
-  <div>
+    <%= render :partial => "users/send_homework_to_course_form", :locals => {:user => user, :courses => courses, :send_id => send_id} %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <div class="courseReferContainer">
-      <% if !courses.empty?  %>
-          <% courses.each do |course| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+current_time_and_term(course) + ']'%></li>
-              </ul>
-          <% end %>
   </div>
-  </div>
-  <div class="cl"></div>
-  <span id="choose_courses_notice" class="c_red"></span>
-  <div>
-    <div class="courseSendSubmit">
-      <a href="javascript:void(0);" onfocus='this.blur();' onclick="send_submit();" class="sendSourceText">确定</a>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a>
-    </div>
-  </div>
-  <div class="cl"></div>
-  <% end %>
 </div>
 <script type="text/javascript">
     function send_submit() {
@@ -58,6 +34,7 @@
         $.ajax({
             url: '<%= url_for(:controller => 'users', :action => 'choose_user_course') %>'+'?search='+ e.target.value+'&send_id=<%=send_id %>',
             type:'get',
+            data: {is_observe:true},
             success: function(data){  },
             beforeSend: function(){ $(this).addClass('ajax-loading'); },
             complete: function(){ $(this).removeClass('ajax-loading'); }

app/views/users/_send_homework_to_course_form.html.erb

@@ -0,0 +1,27 @@
+<%= form_tag send_homework_to_course_user_path(user), :remote => true, :id => 'choose_course_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <div class="courseReferContainer">
+    <% if !courses.empty? %>
+        <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name, :lendght => 25) + '['+current_time_and_term(course) + ']' %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div class="cl"></div>
+<span id="choose_courses_notice" class="c_red"></span>
+<div>
+  <div class="courseSendSubmit">
+    <a href="javascript:void(0);" onfocus='this.blur();' onclick="send_submit();" class="sendSourceText">确定</a>
+  </div>
+  <div class="courseSendCancel">
+    <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a>
+  </div>
+</div>
+<div class="cl"></div>

app/views/users/_user_activities.html.erb

@@ -64,36 +64,36 @@
                     <% when 'Course' %>
                         <% case user_activity.act_type.to_s %>
                         <% when 'HomeworkCommon' %>
-                            <% cache (act) do %>
+                            <%# cache (act) do %>
                             <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %>
-                            <% end %>
+                            <%# end %>
                         <% when 'News' %>
-                        <% cache [act, act.comments.count] do %>
+                        <%# cache [act, act.comments.count] do %>
                             <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
-                        <% end %>
+                        <%# end %>
                         <% when 'Message'%>
                             <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %>
                         <% when 'Poll' %>
                             <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
                         <% when 'Course'%>
-                        <% cache (act) do %>
+                        <%# cache (act) do %>
                             <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => act.id} %>
-                        <%end%>
+                        <%# end%>
                         <% when 'JournalsForMessage'%>
                         <%= render :partial => 'users/course_journalsformessage', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
                         <% end %>
                     <% when 'Project' %>
                         <% case user_activity.act_type.to_s %>
                         <% when 'Issue' %>
-                        <% cache [act, act.journals.count, act.attachments.count] do%>
+                        <%# cache [act, act.journals.count, act.attachments.count] do%>
                             <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id, :user_id => user_id} %>
-                        <% end %>
+                        <%# end %>
                         <% when 'Message' %>
                             <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %>
                         <% when 'ProjectCreateInfo'%>
-                        <% cache (act) do %>
+                        <%# cache (act) do %>
                             <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
-                        <% end %>
+                        <%# end %>
                         <% end %>
                     <% when 'Principal' %>
                         <% case user_activity.act_type.to_s %>
@@ -103,12 +103,12 @@
                             <% end %>
                         <% end %>
                     <% when 'Blog'%>
-                        <% cache (act) do %>
+                        <%# cache (act) do %>
                         <% case user_activity.act_type.to_s %>
                         <% when 'BlogComment' %>
                             <%= render :partial => 'user_blog', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                         <% end %>
-                        <% end %>
+                        <%# end %>
                     <% end %>
 
             <% end %>

app/views/users/choose_user_course.js.erb

@@ -1,3 +1,4 @@
+<% if params[:is_observe].nil? %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>');
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
@@ -5,3 +6,6 @@ $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' sty
 $('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+<% else %>
+    $("#send_homework_to_course_form").html("<%= escape_javascript(render :partial => 'users/send_homework_to_course_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>");
+<% end %>

app/views/users/new_user_commit_homework.html.erb

@@ -133,7 +133,6 @@
           <% else %>
             <div class="ProResultTable " >
               <ul class="ProResultUl " >
-              <% logger.error("################################################{test.results}") %>
               <% test.results.reverse.each_with_index do |x, i| %>
                 <% unless x.nil? %>
                   <li ><span class="w60 T_C">测试<%=test.results.size-i%></span>

lib/redmine/pagination.rb

@@ -171,7 +171,7 @@ module Redmine
             if args[2][:path].nil?
               link_to text, params.merge(parameters), options
             else
-              page = "&page" + parameters[:page].to_s unless parameters[:page].nil?
+              page = "&page=" + parameters[:page].to_s unless parameters[:page].nil?
               link_to text, args[2][:path].to_s + page, options
             end
           end

public/javascripts/application.js

@@ -1221,3 +1221,20 @@ function clear_data(k,mdu){
         $("#e_tip").html("");
     }
 }
+
+function expand_reply(container,btnid){
+  var target = $(container);
+  var btn = $(btnid);
+  if(btn.data('init')=='0'){
+    btn.data('init',1);
+    btn.html('收起回复');
+    target.show();
+  }else{
+    btn.data('init',0);
+    btn.html('展开更多');
+    target.hide();
+    target.eq(0).show();
+    target.eq(1).show();
+    target.eq(2).show();
+  }
+}

public/stylesheets/new_user.css

@@ -497,7 +497,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:110px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
-.boxContainer {height:33px; line-height:33px; position:relative}
+.boxContainer {height:auto; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}

public/stylesheets/public.css

@@ -450,7 +450,7 @@ a:hover.search_btn{ background: #0fa9bb;}
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:110px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
-.boxContainer {height:33px; line-height:33px; position:relative}
+.boxContainer {height:auto; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}