删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题

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/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/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/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();
             }
@@ -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">

app/views/users/_user_message_course.html.erb

@@ -370,7 +370,7 @@
                 <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了作品评论：</span>
               </li>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
+                <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %>
                             <!--:onmouseover => "message_titile_show($(this),event)",-->
                             <!--:onmouseout => "message_titile_hide($(this))" %>-->
                 </a>

public/javascripts/des_kindEditor.js

@@ -131,7 +131,7 @@ function init_des_data(){
                 });
                 params.submit_btn.click(function () {
                     params.editor.sync();
-                    params.form[0].submit();
+                    params.form.submit();
                 });
                 params.textarea.data('init', 1);
                 $(this).show();