kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

部门的审批

This commit is contained in:
XuCheng642 2017-08-18 10:50:35 +08:00
parent 01bc990770
commit bb4e90ca7b
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/managements_controller.rb
View File

@ -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

2
app/views/managements/_all_schools.html.erb
View File

@ -8,7 +8,7 @@
<input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入名称搜索" class="task-height-40 panel-box-sizing fl edu-txt-w320 ml30" style="padding: 2px 5px" />
</div>
<div class="cl"></div>
<div id="schools_list" class="mb20 ml40 mr40">
<div id="schools_list" class="mt10 mb20 ml40 mr40">
<%= render :partial => "managements/update_school_form", :locals => {:schools => schools, :edit_id => edit_id} %>
</div>
<span id="choose_courses_notice" class="c_red"></span>

2
app/views/managements/_depart_list.html.erb
View File

@ -18,7 +18,7 @@
<td class="center">
<%= 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" %>
</td>
</tr>
<% end %>