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

Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb

app/controllers/blog_comments_controller.rb

@@ -71,18 +71,18 @@ class BlogCommentsController < ApplicationController
         @course.save
         redirect_to course_path(:id=>params[:course_id])
       else
-        @article.children.delete
-        @article.delete
+        @article.children.destroy
+        @article.destroy
         redirect_to user_blogs_path(:user_id=>User.current)
       end
 
     else#如果是回复被删，
       if params[:course_id] #如果带了course_id过来了，那么这是要跳到课程大纲去的
-        @article.delete
+        @article.destroy
         redirect_to syllabus_course_path(:id=>params[:course_id])
       else
         root = @article.root
-        @article.delete
+        @article.destroy
         redirect_to user_blog_blog_comment_path(:user_id=>root.author_id,:blog_id=>root.blog_id,:id=>root.id)
       end
 

app/controllers/org_subfields_controller.rb

@@ -11,7 +11,7 @@ class OrgSubfieldsController < ApplicationController
         sql = "select subfield_subdomain_dirs.* from subfield_subdomain_dirs, org_subfields where subfield_subdomain_dirs.org_subfield_id = org_subfields.id "+
               "and org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir]}'"
         if SubfieldSubdomainDir.find_by_sql(sql).count == 0
-          SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir])
+          SubfieldSubdomainDir.create(:org_subfield_id => @subfield.id, :name => params[:sub_dir].downcase)
         end
       end
       @subfield.update_attributes(:field_type => params[:field_type])

app/controllers/organizations_controller.rb

@@ -225,7 +225,7 @@ class OrganizationsController < ApplicationController
       condition = "%#{params[:name].strip}%".gsub(" ","")
     end
     sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'"+
-        "and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id})"
+        "and courses.id not in (select distinct org_courses.course_id from org_courses where org_courses.organization_id = #{@organization.id}) and courses.is_delete=0"
     #user_courses = Course.find_by_sql(sql)
     @courses = Course.find_by_sql(sql)
     # @added_course_ids = @organization.courses.map(&:id)
@@ -269,7 +269,7 @@ class OrganizationsController < ApplicationController
       condition = "%#{params[:name].strip}%".gsub(" ","")
     end
     sql = "select projects.* from projects inner join members on projects.id = members.project_id where members.user_id = #{User.current.id} and projects.status != 9 and projects.name like '#{condition}'" +
-          " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id})"
+          " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id}) and status=1"
     #user_projects = Course.find_by_sql(sql)
     @projects = Course.find_by_sql(sql)
     # @added_course_ids = @organization.projects.map(&:id)

app/controllers/student_work_controller.rb

@@ -63,6 +63,13 @@ class StudentWorkController < ApplicationController
         homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
       end
     end
+
+    #修改作品提示消息更新
+    student_work_messages = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, StudentWork.name, 0)
+    student_work_messages.each do |message|
+      message.update_attribute(:viewed, true)
+    end
+
     # 作品打分消息状态更新
     studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
     studentworks_scores.each do |studentworks_score|
@@ -369,6 +376,8 @@ class StudentWorkController < ApplicationController
       @work.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@work)
       if @work.save
+        #如果学生作品被打分后修改，应该给老师提示
+        send_message_to_teacher(@work)
         if @homework.homework_type == 3
           @student_work_project = @homework.student_work_projects.where("user_id=?",User.current.id).first
           student_work_projects = @homework.student_work_projects.where("student_work_id=? and is_leader =?",@work.id,0)

app/controllers/users_controller.rb

@@ -714,6 +714,7 @@ class UsersController < ApplicationController
       end
 
       student_work.save
+      send_message_to_teacher(student_work)
       homework.update_attributes(:updated_at => Time.now)
       update_course_activity(homework.class,homework.id)
       update_user_activity(homework.class,homework.id)
@@ -1213,12 +1214,12 @@ class UsersController < ApplicationController
                                                  params[:course_id],  'JoinCourseRequest', User.current.id, @user.id, false)
       join_course_messages.update_all(:viewed => true)
     end
-    shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
-    shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
+    shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id)
+    shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id)
     @page = params[:page] ? params[:page].to_i + 1 : 0
     user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")"
     user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")"
-    course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+    course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')"
     project_types = "('Message','Issue','ProjectCreateInfo')"
     principal_types = "JournalsForMessage"
     if params[:type].present?
@@ -1231,6 +1232,8 @@ class UsersController < ApplicationController
           @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Message'").order('updated_at desc').limit(10).offset(@page * 10)
         when "course_poll"
           @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'Poll'").order('updated_at desc').limit(10).offset(@page * 10)
+        when "course_journals"
+          @user_activities = UserActivity.where("container_type = 'Course' and container_id in #{user_course_ids} and act_type = 'JournalsForMessage'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_issue"
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Issue'").order('updated_at desc').limit(10).offset(@page * 10)
         when "project_message"
@@ -1250,7 +1253,8 @@ class UsersController < ApplicationController
       #  @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10)
       # blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")"
       # 减少数据库交互
-      user_ids = "(" + @user.id.to_s + "," + User.watched_by(@user.id).map{|u| u.id }.join(',') + ")"
+      watched_user_ids = User.watched_by(@user.id).count == 0 ? " " : ("," + User.watched_by(@user.id).map{|u| u.id.to_s }.join(','))
+      user_ids = "(" + @user.id.to_s + watched_user_ids + ")"
       watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",")
       blog_ids = "(" + watched_user_blog_ids + ")"
 

app/helpers/application_helper.rb

@@ -2137,6 +2137,20 @@ module ApplicationHelper
 
   end
 
+  #如果学生作品被打分后修改，应该给老师提示
+  def send_message_to_teacher student_work
+    if StudentWork === student_work
+      if student_work.student_works_scores.any?
+        course = student_work.homework_common.course
+        course.members.map(&:user_id).uniq.each do|user_id|
+          if User.find(user_id).allowed_to?(:as_teacher, course)
+            student_work.course_messages << CourseMessage.new(:user_id => user_id, :course_id => course.id, :viewed => false, :status => 1)
+          end
+        end
+      end
+    end
+  end
+
   private
 
   def wiki_helper
@@ -3044,3 +3058,7 @@ def is_default_field? field
   (field.name == 'activity' || field.name == 'course' || field.name == 'project') && field.field_type == 'default'
 end
 
+def host_with_protocol
+  return Setting.protocol + "://" + Setting.host_name
+end
+

app/helpers/org_member_helper.rb

@@ -9,7 +9,7 @@ module OrgMemberHelper
     principals = paginateHelper scope,10
     s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
     links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
-      link_to text, org_member_autocomplete_org_member_index_path(parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js')), :remote => true
+      link_to text,  host_with_protocol + "/org_member/org_member_autocomplete?" + parameters.merge(:q => params[:q],:flag => true,:org=> org, :format => 'js').to_query, :remote => true
     }
     s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end

app/models/principal.rb

@@ -42,9 +42,9 @@ class Principal < ActiveRecord::Base
     if q.blank?
       where({})
     else
-      pattern = "%#{q}%"
+      pattern = "%#{q}%".gsub("/","//").gsub("_","/_")
       # sql = %w(login firstname lastname mail).map {|column| "LOWER(#{table_name}.#{column}) LIKE LOWER(:p)"}.join(" OR ")
-      sql= "LOWER(concat(lastname,firstname)) LIKE LOWER(:p) or LOWER(login) LIKE LOWER(:p) or LOWER(mail) LIKE LOWER(:p)"
+      sql= "LOWER(concat(lastname,firstname)) LIKE LOWER(:p) or LOWER(login) LIKE LOWER(:p) or LOWER(mail) LIKE LOWER(:p) escape '/'"
       params = {:p => pattern}
       if q =~ /^(.+)\s+(.+)$/
         a, b = "#{$1}%", "#{$2}%"

app/views/attachments/_activity_attach.html.erb

@@ -3,14 +3,14 @@
         <div class="break_word">
           <span class="fl">
           <span title="<%= attachment.filename %>" id="attachment_<%=attachment.id %>">
-            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw400', :download => true -%>
+            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw380', :download => true -%>
           </span>
           </span>
           <span class="postAttSize">(
             <%= number_to_human_size attachment.filesize %>)
           </span>
           <span class="author" title="<%= attachment.author%>">
-            <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+            <%= link_to h(truncate(attachment.author.name, length: 15, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
             <%= format_time(attachment.created_on) %>
           </span>
         </div>

app/views/files/_org_order_filter.html.erb

@@ -0,0 +1,9 @@
+<% if @order == "asc" %>
+    按&nbsp;<%= link_to "时间",params.merge(:sort => "created_on:desc", :order => order,:tag_name => tag_name,:name => search_name),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
+    <%= link_to "下载次数",params.merge(:sort => "downloads:desc", :order => order,:tag_name => tag_name,:name => search_name),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp;/&nbsp;
+    <%= link_to "引用次数",params.merge(:sort => "quotes:desc", :order => order,:tag_name => tag_name,:name => search_name),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
+<% else %>
+    按&nbsp;<%= link_to "时间",params.merge(:sort => "created_on:asc", :order => order, :tag_name => tag_name,:name => search_name),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
+    <%= link_to "下载次数",params.merge(:sort => "downloads:asc", :order => order, :tag_name => tag_name,:name => search_name),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp; /&nbsp;
+    <%= link_to "引用次数",params.merge(:sort =>"quotes:asc", :order => order, :tag_name => tag_name,:name => search_name),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
+<% end %>

app/views/files/_subfield_files.html.erb

@@ -56,16 +56,8 @@
         </div>
         <div class="cl"></div>
         <p class="f_l  fontBlue f_b f_14">共有&nbsp;<span id="attachment_count"><%= User.current.member_of_org?(@org_subfield.organization) ? @all_attachments.count : @all_attachments.select{|attach| attach.is_public == 1 }.count %></span>&nbsp;个资源</p>
-        <p class="f_r" style="color: #808080">
-          <% if @order == "asc" %>
-              按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
-              <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp;/&nbsp;
-              <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
-          <% else %>
-              按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %>&nbsp;/&nbsp;
-              <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %>&nbsp; /&nbsp;
-              <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %>&nbsp;排序
-          <% end %>
+        <p class="f_r" style="color: #808080" id="org_sort">
+          <%= render :partial => 'files/org_order_filter', :locals => {:order => @order, :sort => @sort, :tag_name => @tag_name, :search_name => nil} %>
         </p>
       </div>
       <div class="cl"></div>

app/views/files/search_files_in_subfield.js.erb

@@ -5,4 +5,6 @@
     $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
         :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
     $("#attachment_count").html("<%= @result.count %>");
+    $("#org_sort").html("<%= escape_javascript(render :partial => 'org_order_filter',
+        :locals => {:sort => @sort, :order => @order, :tag_name => @tag_name, :search_name => @q}) %>");
 <% end %>

app/views/files/search_org_subfield_tag_attachment.js.erb

@@ -1,3 +1,5 @@
 $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
     :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
 $("#attachment_count").html("<%= @result.count %>");
+$("#org_sort").html("<%= escape_javascript(render :partial => 'org_order_filter',
+    :locals => {:sort => @sort, :order => @order, :tag_name => @tag_name,:search_name => @q}) %>");

app/views/layouts/base_org.html.erb

@@ -90,8 +90,8 @@
           <% end%>
         </div>
         <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
-        <div class="orgName fl mb5 f14">
-          <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+        <div class="orgName fl mb5 f14" title="<%= @organization.name %>">
+          <%= link_to truncate(@organization.name,:length => 26), organization_path(@organization.id), :class=>"pr_info_name c_dark fb break_word" %>
           <% if User.current.logged? %>
               <% if @organization.is_public? %>
                   <span class="img_private"><%= l(:label_public)%></span>

app/views/org_document_comments/new.html.erb

@@ -32,7 +32,10 @@
         location.href = document.referrer;
     }
 </script>
-<div class="resources" nhname="new_topic_form">
+<div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>; margin-bottom:10px;">
+  <div class="NewsBannerName"><%= OrgSubfield.try(:find, params[:field_id]).try(:name) %></div>
+</div>
+<div class="resources" nhname="new_topic_form" style="padding-top:<%= params[:field_id].present? ? '0px': '15px' %>">
   <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
     <div>
         <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></textarea>

app/views/org_subfields/create.js.erb

@@ -4,7 +4,6 @@
         :locals => {:subfields => @organization.org_subfields.order("priority") }) %>");
     $("#sub_field_left_lists").html("");
     $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
-    $("#subfield_name").val("");
-<% else %>
-    $("#subfield_name").val("");
 <% end %>
+$("#subfield_name").val("");
+$("#sub_dir").val("");

app/views/organizations/_org_left_subfield_list.html.erb

@@ -63,7 +63,7 @@
               </div>
               <div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">
                 <ul >
-                  <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+                  <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>organization.courses.where("is_delete=0").reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
                 </ul>
               </div>
             </div>
@@ -77,7 +77,7 @@
               </div>
               <div class="homepageLeftMenuCourses" id="homepageLeftMenuProjects" style="display:<%= organization.projects.count == 0?'none':'' %>">
                 <ul>
-                  <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
+                  <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.where("status=1").reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
                 </ul>
               </div>
             </div>

app/views/organizations/_show_org_document.html.erb

@@ -10,6 +10,9 @@
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
             <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
+        <% if @organization.home_id == document.id %>
+            <span class="red_homework_btn_cir ml5">已设为首页</span>
+        <% end %>
       </div>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
       <div class="homepagePostDate fl">

app/views/organizations/_subfield_list.html.erb

@@ -54,7 +54,7 @@
                 </div>
             <% end %>
             <div id="sub_dir_edit_<%= field.id %>" style="display:none;">
-              <input type="text" name="name" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
+              <input type="text" name="name" onfocus="observe_input_to_lowercase($(this));" onblur="update_sub_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>','<%= field.id %>',$(this).val().toLowerCase());" value="<%= field.subfield_subdomain_dir.nil? ?  '': field.subfield_subdomain_dir.name %>" style="width:70px;"/>
             </div>
           </li>
           <%#= link_to "隐藏", hide_org_subfield_organizations_path(field), :method => 'post', :remote => true, :id => "hide_#{field.id}", :class => "linkBlue fr mr5" %>
@@ -85,6 +85,9 @@
                     url: "/org_subfields/" + field_id + "?name=" + input_value,
                     type: 'put'
                 });
+            else{
+                $(edit_id).children("input").val($(show_id).html().trim());
+            }
         }
         $(show_id).show();
         $(edit_id).hide();
@@ -109,6 +112,9 @@
                     url: "/org_subfields/" + field_id + "/update_sub_dir?sub_dir_name=" + input_value,
                     type: 'put'
                 });
+            else{
+                $(edit_id).children("input").val($(show_id).html().trim());
+            }
         }
         $(show_id).show();
         $(edit_id).hide();
@@ -128,16 +134,13 @@
     function update_priority(show_id, edit_id, field_id, input_value){
         var re = /^[0-9]*[1-9]*[0-9]$/
         if(re.test(input_value) && $(show_id).html().trim() != input_value.trim() && input_value.trim() != ''){
-            if(confirm("确定修改为" + input_value + "?")){
-                $.ajax({
-                    url: "/org_subfields/" + field_id + "/update_priority?priority=" + input_value,
-                    type: 'put'
-                });
-            }
+            $.ajax({
+                url: "/org_subfields/" + field_id + "/update_priority?priority=" + input_value,
+                type: 'put'
+            });
         }
-        else
-        {
-            $(edit_id).find("input").val($(show_id).html().trim());
+        else{
+            $(edit_id).children("input").val($(show_id).html().trim());
         }
         $(show_id).show();
         $(edit_id).hide();

app/views/organizations/new.html.erb

@@ -30,7 +30,7 @@
         </li>
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
-          <input id="organization_is_public" name="organization[is_public]" onblur="disable_down($(this), $('#organization_alow_download'), $('#allow_down_hint'));" type="checkbox" value="1" checked="checked">
+          <input id="organization_is_public" name="organization[is_public]" onclick="disable_down($(this), $('#organization_alow_download'), $('#allow_down_hint'));" type="checkbox" value="1" checked="checked">
           <span class="c_grey">（打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）</span>
           <div class="cl"></div>
         </li>

app/views/organizations/setting.html.erb

@@ -19,8 +19,11 @@
                 '<%=  check_uniq_organizations_path%>'+'?org_name='+$("#organization_name").val().trim()+"&config_page=Y" + "&org_id="+id
         )
     }
-        function update_org(id){
-            check_uniq(id);
+        function update_org(id, old_value, input_value){
+            if (old_value == input_value)
+            {
+                check_uniq(id);
+            }
             if( $checkName){
                 $("#edit_organization_"+id).submit();
             }
@@ -57,7 +60,7 @@
         <div style="margin-left: 80px " id="check_desc_hint"></div>
         <div class="orgRow mb10"><span class="ml10">组织URL：</span>
           <div class="w607 fr">http：//
-            <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" />
+            <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" onfocus="observe_input_to_lowercase($(this));" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
             <% record = OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first %>
             <% if domain.present? and record.present? and record.content == domain.subname %>
@@ -77,7 +80,7 @@
           &nbsp;<span>允许游客下载</span>
           <span class="c_green f12" id="allow_down_hint"><%= @organization.is_public? ? "" : "（私有组织不允许游客下载资源）" %></span>
         </div>
-        <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org(<%=@organization.id %>);">保存</a>
+        <a href="javascript:void(0);" class="saveBtn ml80 db fl" onclick="update_org('<%=@organization.id %>','<%= @organization.name %>', $('#organization_name'));">保存</a>
         <% end %>
       </div>
       <div class="undis ml15 mr15" id="orgContent_2">
@@ -96,7 +99,7 @@
             <p class="fontBlue fb mb5">添加成员</p>
             <%= form_tag url_for(:controller => 'org_member',:action => 'create',:org=>@organization),:id=>'org_member_add_form',:remote=>true do |f|%>
                 <input type="text" id="not_org_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、登录名搜索" class="orgAddSearch mb20" />
-                <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript org_member_autocomplete_org_member_index_path(:org=>@organization, :format => 'js') }')" %>
+                <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript  host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %>
                 <div id="principals_for_new_member">
                   <%= find_user_not_in_current_org_by_name(@project) %>
                 </div>
@@ -129,9 +132,9 @@
                 <div class="mb5">
                   <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
                   <% if domain %>
-                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
+                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input id="sub_dir" class="fl personalUrl ml3" type="text" name="sub_dir" onfocus="observe_input_to_lowercase($(this));">
                   <% else %>
-                      <span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>
+                      <span class="fl" style="width:195px;">您还没有子域名，请先在左侧信息栏申请子域名</span>
                   <% end %>
                   <div class="cl"></div>
                 </div>
@@ -195,12 +198,25 @@
     }
   }
 
-//  $(document).ready(function(){
-//    if ( $("#is_public").attr("checked") != true){
-//        alert($(this).attr("checked"));
-//        $("#allow_download").attr("checked", false);
-//        $("#allow_download").attr("disabled", true);
-//        $("#allow_down_hint").html("");
-//  }
-//  });
+  //输入子域名或者二级目录，自动将输入换成小写
+  function observe_input_to_lowercase(id){
+      $(id).each(function(){
+          var $this = $(this);
+          var old_input = $this.val();
+          var check=function(){
+              var val = $this.val();
+              if ( old_input != val){
+                  $this.val(val.toLowerCase());
+                  old_input = val.toLowerCase();
+              }
+          };
+          var reset = function() {
+              if (timer) {
+                  clearInterval(timer);
+              }
+          };
+          var timer = setInterval(check, 300);
+          $this.bind('blur', reset);
+      });
+  }
 </script>

app/views/student_work/_programing_work_show.html.erb

@@ -59,7 +59,7 @@
                           <% if x["status"].to_i != 0 %>
                               <span class="w150 c_red">测试错误！</span>
                               <span class="w60">您的输出：</span>
-                              <span class="width150"><pre><%=x["result"]%></pre></span>
+                              <span class="width150"><pre><%=x["result"].force_encoding("UTF-8")%></pre></span>
                               <span class="w60">正确输出：</span>
                               <span  class="width150"><pre><%=x["output"]%></pre></span>
                               <div class="cl"></div>

app/views/student_work/_student_work_list.html.erb

@@ -46,45 +46,43 @@
 <% end%>
 <script type="text/javascript">
   $(function(){
-      <% if !@is_evaluation && !@is_teacher %>
-        <% work = @homework.student_works.where("user_id = ?",User.current.id).first %>
-      <% elsif !@message_student_work_id.nil? %>
-        <% work = @homework.student_works.where("id =?", @message_student_work_id).first %>
-      <% end %>
-      <% unless work.nil? %>
-      <% if @homework.homework_type == 2 %>
-      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+      <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) %>
+          <% work= params[:show_work_id].nil? ? @homework.student_works.where("user_id = ?",User.current.id).first : StudentWork.find(params[:show_work_id]) %>
+          <% unless work.nil? %>
+              <% if @homework.homework_type == 2 %>
+                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
 
-      var program_name = "text/x-csrc";
-      var language = <%= @homework.language %>;
-      if (language == 1) {
-          program_name = 'text/x-csrc';
-      } else if(language==2){
-          program_name = 'text/x-c++src';
-      }else if(language==3){
-          program_name = 'text/x-cython';
-      } else if(language==4){
-          program_name = 'text/x-java';
-      }
-      var editor = CodeMirror(document.getElementById("work-code_<%= work.id%>"), {
-          mode: {name: program_name,
-              version: 2,
-              singleLineStringErrors: false},
-          lineNumbers: true,
-          indentUnit: 2,
-          matchBrackets: true,
-          readOnly: true,
-          value: $("#work-src_<%= work.id%>").text()
-      });
-      <% elsif @homework.homework_type == 1 %>
-      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
-      <% elsif @homework.homework_type == 3 %>
-      <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
-      <% if pro && pro.student_work_id == work.id %>
-      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
-      <% end %>
-      <% end %>
-      $('#score_<%= work.id%>').peSlider({range: 'min'});
+                  var program_name = "text/x-csrc";
+                  var language = <%= @homework.language %>;
+                  if (language == 1) {
+                      program_name = 'text/x-csrc';
+                  } else if(language==2){
+                      program_name = 'text/x-c++src';
+                  }else if(language==3){
+                      program_name = 'text/x-cython';
+                  } else if(language==4){
+                      program_name = 'text/x-java';
+                  }
+                  var editor = CodeMirror(document.getElementById("work-code_<%= work.id%>"), {
+                              mode: {name: program_name,
+                                  version: 2,
+                                  singleLineStringErrors: false},
+                              lineNumbers: true,
+                              indentUnit: 2,
+                              matchBrackets: true,
+                              readOnly: true,
+                              value: $("#work-src_<%= work.id%>").text()
+                          });
+              <% elsif @homework.homework_type == 1 %>
+                  $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+              <% elsif @homework.homework_type == 3 %>
+                  <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
+                  <% if pro && pro.student_work_id == work.id %>
+                      $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
+                  <% end %>
+              <% end %>
+            $('#score_<%= work.id%>').peSlider({range: 'min'});
+          <% end %>
       <% end %>
   });
 </script>

app/views/users/_user_activities.html.erb

@@ -54,56 +54,64 @@
                 sd_create_editor_from_data(<%= user_activity.id %>, null, "100%", "<%= user_activity.class.to_s %>");
             });
         </script>
-        <% unless user_activity.act_type == "ProjectCreateInfo" %>
-        <% act= user_activity.act  %>
-        <% case user_activity.container_type.to_s %>
-        <% when 'Course' %>
-            <% if act  %>
-                <% case user_activity.act_type.to_s %>
-                <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %>
-                <% when 'News' %>
-                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
-                <% 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'%>
-                    <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => act.id} %>
-                <% end %>
-            <% end %>
-        <% when 'Project' %>
-            <% if act  %>
-                <% case user_activity.act_type.to_s %>
-                <% when 'Issue' %>
-                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id, :user_id => user_id} %>
-                <% when 'Message' %>
-                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %>
-                <% when 'ProjectCreateInfo'%>
-                    <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
-                <% end %>
-            <% end %>
-        <% when 'Principal' %>
-            <% if act  %>
-                <% case user_activity.act_type.to_s %>
-                <% when 'JournalsForMessage' %>
-                    <% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
-                        <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
+        <% if user_activity.act_type == "ProjectCreateInfo" %>
+            <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id} %>
+        <% else %>
+            <% act= user_activity.act  %>
+            <%if act %>
+
+                    <% case user_activity.container_type.to_s %>
+                    <% when 'Course' %>
+                        <% case user_activity.act_type.to_s %>
+                        <% when 'HomeworkCommon' %>
+                            <% cache (act) do %>
+                            <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %>
+                            <% end %>
+                        <% when 'News' %>
+                        <% cache [act, act.comments.count] do %>
+                            <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                        <% 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 %>
+                            <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => act.id} %>
+                        <%end%>
+                        <% end %>
+                    <% when 'Project' %>
+                        <% case user_activity.act_type.to_s %>
+                        <% when 'Issue' %>
+                        <% 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 %>
+                        <% 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 %>
+                            <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
+                        <% end %>
+                        <% end %>
+                    <% when 'Principal' %>
+                        <% case user_activity.act_type.to_s %>
+                            <% when 'JournalsForMessage' %>
+                            <% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
+                                <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
+                            <% end %>
+                        <% end %>
+                    <% when 'Blog'%>
+                        <% 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 %>
             <% end %>
-        <% when 'Blog'%>
-             <%if act %>
-                    <% 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 %>
-        <% else %>
-            <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id} %>
         <% end %>
-    <% end %>
 <% end %>
 
 <% if user_activities.count == 10%>