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

app/models/principal.rb

@@ -44,7 +44,7 @@ class Principal < ActiveRecord::Base
     else
       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) escape '/'"
+      sql= "LOWER(concat(lastname,firstname)) LIKE LOWER(:p) escape '/' or LOWER(login) LIKE LOWER(:p) escape '/' or LOWER(mail) LIKE LOWER(:p) escape '/'"
       params = {:p => pattern}
       if q =~ /^(.+)\s+(.+)$/
         a, b = "#{$1}%", "#{$2}%"

app/views/courses/_recommendation.html.erb

@@ -7,8 +7,8 @@
             <div class="fl">
               <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %><div class="cl"></div> </p>
               <p class="f12">
-                <% if course_file_num > 0 %>
-                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to course_file_num, course_files_path(e_course), :class => "linkBlue2" %>)</span>
+                <% if visable_attachemnts_incourse(e_course).count > 0 %>
+                    <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to visable_attachemnts_incourse(e_course).count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
                 <% end %>
                 <% if e_course.homework_commons.where("publish_time <= '#{Date.today}'").count > 0 %>
                     <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.where("publish_time <= '#{Date.today}'").count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>

app/views/layouts/_project_info.html.erb

@@ -1,6 +1,6 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
-<% teacher_num = 0 %>
-<% student_num = 0 %>
+<% teacher_num = TeacherAndAssistantCount(@course) %>
+<% student_num = studentCount(@course) %>
 <div class="pr_info_logo fl mr10 mb5">
   <% if is_excellent_course(@course) %>
     <img src="/images/course/boutique.png" width="50" height="auto" alt="精品" class="boutiqueP" />

app/views/layouts/base_courses.html.erb

@@ -169,7 +169,7 @@
         <div class="cl"></div>
       </div><!--项目标签 end-->
       <!--课程推荐-->
-      <%= render :partial => 'courses/recommendation', :locals => {:course => @course, :course_file_num => course_file_num} %>
+      <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
       <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %></div>
     </div><!--LSide end-->
 

app/views/org_document_comments/edit.html.erb

@@ -12,10 +12,12 @@
         if($("#document_title").val().trim() == "")
         {
             $("#doc_title_hint").html("<span class='c_red'>标题不能为空</span>").show();
+            return false;
         }
         else
         {
             $("#doc_title_hint").hide();
+            return true;
         }
     }
 </script>

app/views/org_document_comments/new.html.erb

@@ -38,7 +38,7 @@
 <div class="resources" nhname="new_topic_form" >
   <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
     <div>
-        <input 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="请输入文章标题"></input>
+        <input class="postDetailInput fl mr15"  name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></input>
     </div>
     <div id="doc_title_hint">
     </div>

app/views/organizations/_show_org_document.html.erb

@@ -10,7 +10,7 @@
         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 %>
+        <% if document.organization.home_id == document.id %>
             <span class="red_homework_btn_cir ml5">已设为首页</span>
         <% end %>
       </div>