Merge branch 'dev_xucheng' into develop

app/controllers/managements_controller.rb

@@ -230,6 +230,7 @@ class ManagementsController < ApplicationController
         @c_shixuns= @c_shixuns.where("name like '%#{search}%'")
       end
     end
+    @c_shixuns = @c_shixuns.reorder("created_at desc")
     unless params[:school_id] || params[:search] || params[:keyword] || params[:status]
        user_exs = UserExtensions.where(:user_id => @c_shixuns.map(&:user_id))
        @schools = School.where(:id => user_exs.map(&:school_id))
@@ -272,16 +273,6 @@ class ManagementsController < ApplicationController
     end
   end
 
-  def delete_subject
-    @subject = Subject.find params[:subject_id]
-    if @subject
-      @subject.destroy
-      respond_to do |format|
-        format.js
-      end
-    end
-  end
-
   # 0 全部；1 活动的； 2 已注册； 3 锁定
   def users
     @menu_type =7

app/controllers/subjects_controller.rb

@@ -124,6 +124,16 @@ class SubjectsController < ApplicationController
     redirect_to subject_path(@subject)
   end
 
+  def destroy
+    if @subject
+      ApplyAction.where(:container_type => "ApplySubject", :container_id => @subject.id).destroy_all
+      @subject.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   private
   # Find subject of id params[:id]
   def find_subject

app/views/layouts/base_management.html.erb

@@ -53,13 +53,12 @@
       <ul class="edu-admin-nav clearfix ">
         <li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">主页</a></li>
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 2 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">课堂+</a>
-          <!--<ul class="edu-admin-nav-inner edu-absolute">-->
-            <!--<li><%#= link_to "课程列表", classroom_managements_path %></li>-->
-            <!--<li><%#= link_to "班级列表", classroom_classment_managements_path %></li>-->
-          <!--</ul>-->
+          <ul class="edu-admin-nav-inner edu-absolute">
+            <li><%= link_to "课程列表", classroom_managements_path %></li>
+            <li><%= link_to "班级列表", classroom_classment_managements_path %></li>
+          </ul>
         </li>
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 3 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">项目实训+</a>
-          <%#= link_to "实训+", shixuns_managements_path, :class => "edu-admin-nav-a" %>
           <ul class="edu-admin-nav-inner edu-absolute">
             <li><%= link_to "实训列表", shixuns_managements_path %></li>
             <li><%= link_to "已发布的实训", publish_shixuns_managements_path %></li>
@@ -67,7 +66,6 @@
           </ul>
         </li>
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 4 %>" style="width: 100px"><a href="javascript:void(0);" class="edu-admin-nav-a" >实训套件+</a>
-          <%#= link_to "实训+", shixuns_managements_path, :class => "edu-admin-nav-a" %>
           <ul class="edu-admin-nav-inner edu-absolute">
             <li style="width: 100px"><%= link_to "实训套件列表", class_shixuns_managements_path %></li>
             <li style="width: 100px"><%= link_to "已发布实训套件", class_publish_shixuns_managements_path %></li>
@@ -75,10 +73,10 @@
         </li>
         <li class="fl edu-admin-nav-li"><a href="javascript:void(0);" class="edu-admin-nav-a">竞赛+</a></li>
         <li class="fl edu-admin-nav-li edu-position"><a href="javascript:void(0);" class="edu-admin-nav-a">单位</a>
-          <!--<ul class="edu-admin-nav-inner edu-absolute">-->
-            <!--<li><%#= link_to "单位列表", departments_part_managements_path, :class => "edu-admin-nav-a" %></li>-->
-            <!--<li><%#= link_to "单位部门列表", departments_managements_path%></li>-->
-          <!--</ul>-->
+          <ul class="edu-admin-nav-inner edu-absolute">
+            <li><%= link_to "单位列表", departments_part_managements_path, :class => "edu-admin-nav-a" %></li>
+            <li><%= link_to "单位部门列表", departments_managements_path%></li>
+          </ul>
         </li>
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 7 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">用户</a>
           <ul class="edu-admin-nav-inner edu-absolute">
@@ -92,8 +90,8 @@
           <ul class="edu-admin-nav-inner">
             <li><%= link_to "身份认证", :controller => "managements", :action => "identity_authentication" %></li>
             <li><%= link_to "试用授权", :controller => "managements", :action => "trial_authorization" %></li>
-            <!--<li><%#= link_to "部门审批", depart_managements_path %></li>-->
-            <!--<li><%#= link_to '单位审批', unit_managements_path %></li>-->
+            <li><%= link_to "部门审批", depart_managements_path %></li>
+            <li><%= link_to '单位审批', unit_managements_path %></li>
             <li><%= link_to '项目实训发布', shixun_authorization_managements_path %></li>
             <li><%= link_to '课程实训发布', subject_authorization_managements_path %></li>
           </ul>

app/views/managements/_class_shixuns_list.html.erb

@@ -24,7 +24,11 @@
         <td><%= c_shixun.user.show_real_name %></td>
         <td><%= format_time c_shixun.created_at %></td>
         <td class="class_shixun_delete">
-          <a href="javascript:void(0);" onclick="delete_confirm_box('<%= delete_subject_managements_path(:subject_id => c_shixun.id) %>', '确定要删除该实训套件吗？')">删除</a>
+          <% if c_shixun.status == 0 %>
+            <a href="javascript:void(0);" onclick="delete_confirm_box_2('<%= subject_path(c_shixun) %>', '确定要删除该实训套件吗？')">删除</a>
+          <% else %>
+            --
+          <% end %>
         </td>
       </tr>
   <% end %>

config/routes.rb

@@ -178,7 +178,6 @@ RedmineApp::Application.routes.draw do
       match 'users_authorization_agree'
       match 'users_authorization_cancel'
       get 'update_webssh'
-      get 'delete_subject'
     end
   end
   # Enable Grack support