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

app/controllers/org_document_comments_controller.rb

@@ -39,7 +39,7 @@ class OrgDocumentCommentsController < ApplicationController
     end
     respond_to do |format|
       format.html {
-        if params[:flag] == 0
+        if params[:flag].to_i == 0
           redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)
         else
           redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)

app/controllers/organizations_controller.rb

@@ -161,7 +161,7 @@ class OrganizationsController < ApplicationController
   def  more_org_projects
     @organization = Organization.find params[:id]
     @page = params[:page]
-    @org_projects = @organization.projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    @org_projects = @organization.projects.reorder('created_at').uniq.page((params[:page].to_i || 1) +1).per(5)
     respond_to do |format|
       format.js
     end
@@ -170,7 +170,7 @@ class OrganizationsController < ApplicationController
   def more_org_courses
     @organization = Organization.find(params[:id])
     @page = params[:page]
-    @org_courses = @organization.courses.reorder('created_at').page((params[:page].to_i || 1) + 1 ).per(5)
+    @org_courses = @organization.courses.reorder('created_at').uniq.page((params[:page].to_i || 1) + 1 ).per(5)
     respond_to do |format|
       format.js
     end
@@ -189,16 +189,17 @@ class OrganizationsController < ApplicationController
     if !params[:name].nil?
       condition = "%#{params[:name].strip}%".gsub(" ","")
     end
-    #sql = "select courses.* from courses inner join members on courses.id = members.course_id inner join org_courses on courses.id = org_courses.course_id where org_courses.organization_id != #{@organization.id} and members.user_id = #{User.current.id} and courses.name like '#{condition}'"
+    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}'"+
-    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})"
-    user_courses = Course.find_by_sql(sql)
+    #user_courses = Course.find_by_sql(sql)
-    @added_course_ids = @organization.courses.map(&:id)
+    @courses = Course.find_by_sql(sql)
-    @courses = []
+    # @added_course_ids = @organization.courses.map(&:id)
-    user_courses.each do |course|
+    # @courses = []
-      if !@added_course_ids.include?(course.id)
+    # user_courses.each do |course|
-        @courses << course
+    #   if !@added_course_ids.include?(course.id)
-      end
+    #     @courses << course
-    end
+    #   end
+    # end
   end
 
   def join_courses
@@ -225,15 +226,17 @@ class OrganizationsController < ApplicationController
     if !params[:name].nil?
       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}'"
+    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}'" +
-    user_projects = Course.find_by_sql(sql)
+          " and projects.id not in (select org_projects.project_id from org_projects where organization_id = #{@organization.id})"
-    @added_course_ids = @organization.projects.map(&:id)
+    #user_projects = Course.find_by_sql(sql)
-    @projects = []
+    @projects = Course.find_by_sql(sql)
-    user_projects.each do |project|
+    # @added_course_ids = @organization.projects.map(&:id)
-      if !@added_course_ids.include?(project.id)
+    # @projects = []
-        @projects << project
+    # user_projects.each do |project|
-      end
+    #   if !@added_course_ids.include?(project.id)
-    end
+    #     @projects << project
+    #   end
+    # end
   end
 
   def join_projects

app/views/layouts/base_org.html.erb

@@ -104,7 +104,7 @@
         </div>
           <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuProjects">
             <ul >
-              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
+              <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
               <!--<%#= @organization.org_projects.each do |p|%>-->
               <!--<li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey"><%#= p.name%></a></li>-->
               <!--<%# end %>-->
@@ -131,7 +131,7 @@
           </div>
           <div class="homepageLeftMenuCourses borderBottomNone" id="homepageLeftMenuCourses">
             <ul >
-              <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=>1}%>
+              <%= render :partial => 'layouts/org_courses',:locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=>1}%>
             </ul>
           </div>
         </div>

app/views/organizations/join_courses.js.erb

@@ -1,5 +1,5 @@
 $("#homepageLeftMenuCourses").html("");
 $("#homepageLeftMenuCourses").append("<ul>");
 $("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses',
-    :locals=>{:courses=>@organization.courses.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1})  %>");
+    :locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1})  %>");
 $("#homepageLeftMenuCourses").append("</ul>");

app/views/organizations/join_projects.js.erb

@@ -1,5 +1,5 @@
 $("#homepageLeftMenuProjects").html("");
 $("#homepageLeftMenuProjects").append("<ul>");
 $("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects',
-    :locals=>{:projects=>@organization.projects.reorder('created_at').limit(5),:org_id=>@organization.id,:page=> 1})  %>");
+    :locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1})  %>");
 $("#homepageLeftMenuProjects").append("</ul>");

app/views/users/_user_message_course.html.erb

@@ -411,7 +411,9 @@
     <!-- 创建课程消息 -->
     <% if ma.course_message_type == "Course" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPortrait fl">
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
+          </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您成功创建了课程：</span>
@@ -443,7 +445,7 @@
     <% end %>
     <% if ma.course_message_type == "JoinCourseRequest" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">您有了新的课程成员申请：</span>
@@ -482,7 +484,7 @@
     <% end %>
     <% if ma.course_message_type == "CourseRequestDealResult" %>
         <ul class="homepageNewsList fl">
-          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"></a></li>
+          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a></li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
@@ -548,7 +550,7 @@
     <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
-            <a href="javascript:void(0);"></a>
+            <a href="javascript:void(0);"><div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div></a>
           </li>
           <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">系统提示</span>