diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 118b0f2bd..7ca87b49b 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -225,13 +225,13 @@ end aas.update_attribute(:status, 2) AppliedMessage.create(:user_id => aas.user_id, :status => 2, :viewed => 0, :applied_id => aas.id, :applied_type => "ApplyAddSchools", :name => school[0].name ) users = UserExtensions.where("school_id = #{aas.school_id}") - users.update_all(:school_id => school[0].id) - if aas.school_id != school[0].id.to_i + users.update_all(:school_id => school.id) + if aas.school_id != school.id.to_i aas.school.destroy end - ApplyAddDepartment.where(:school_id => aas.school_id).update_all(:school_id => school[0].id) - Department.where(:school_id => aas.school_id).update_all(:school_id => school[0].id) - aas.update_attribute(:school_id, school[0].id) + ApplyAddDepartment.where(:school_id => aas.school_id).update_all(:school_id => school.id) + Department.where(:school_id => aas.school_id).update_all(:school_id => school.id) + aas.update_attribute(:school_id, school.id) rescue Exception => e puts e end @@ -239,6 +239,7 @@ end # applied_schools.update_column('name', params[:name]) redirect_to unit_managements_path end + # 部门修改 # 课堂列表 def classroom diff --git a/app/views/managements/_all_schools.html.erb b/app/views/managements/_all_schools.html.erb index 2268881f3..d7a8d4c3f 100644 --- a/app/views/managements/_all_schools.html.erb +++ b/app/views/managements/_all_schools.html.erb @@ -8,7 +8,7 @@
-
+
<%= render :partial => "managements/update_school_form", :locals => {:schools => schools, :edit_id => edit_id} %>
diff --git a/app/views/managements/_depart_list.html.erb b/app/views/managements/_depart_list.html.erb index feb0efafd..f13f2ce43 100644 --- a/app/views/managements/_depart_list.html.erb +++ b/app/views/managements/_depart_list.html.erb @@ -18,7 +18,7 @@ <%= link_to( l(:label_approve), { :controller => 'admin', :action => 'approve_applied_departments', :id => apply.id }, :class => "application-default-link" ) %> <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_departments', :id => apply.id, :tip => 'unapplied' },:method => :delete, :confirm => l(:text_are_you_sure), :class => "application-default-link") %> - <%#=link_to '更改', all_schools_managements_path(:school_id =>apply.id), :remote => true, :class => "application-default-link" %> + <%#= link_to '更改',all_schools_managements_path(:school_id =>apply.id), :remote => true, :class => "application-default-link" %> <% end %>