diff --git a/app/controllers/cooperates_controller.rb b/app/controllers/cooperates_controller.rb index 1f43fcaa..8a014d62 100644 --- a/app/controllers/cooperates_controller.rb +++ b/app/controllers/cooperates_controller.rb @@ -1,12 +1,15 @@ class CooperatesController < ApplicationController + before_filter :require_login + before_filter :find_partner, only: [:partner_list] + before_filter :is_admin, only: [:partner_list] def partner_list search = params[:search] - @schools = School.where(id: [179, 3181, 3216]).where("name like ?", "'%#{search}%'") + @schools = School.where(customer_id: @partner.customer_ids) @all_count = @schools.size unless search.blank? - @schools = @schools.where("name like ?", "'%#{search}%'") + @schools = @schools.where("name like ?", "%#{search}%") end @search_count = @schools.size @schools = paginateHelper @schools, 15 @@ -17,4 +20,17 @@ class CooperatesController < ApplicationController format.html{render :layout => "base_edu"} end end + + def find_partner + @partner = Partner.find_by_id(params[:id]) + render_404 if @partner.nil? || @partner.status == -1 + rescue ActiveRecord::RecordNotFound + render_404 + end + + def is_admin + unless User.current.admin? || (User.current.partner.present? && User.current.partner == @partner) + render_403 + end + end end diff --git a/app/models/school.rb b/app/models/school.rb index 19c248cb..dd3332c4 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -61,4 +61,8 @@ class School < ActiveRecord::Base myshixun_id !=0").first.try(:sw_count) end + def statistic_url + dep = departments.where("identifier is not null").first + url = dep.present? ? "/colleges/#{dep.identifier}/statistics" : "" + end end diff --git a/app/views/managements/_users_list.html.erb b/app/views/cooperates/_partner_item.html.erb similarity index 54% rename from app/views/managements/_users_list.html.erb rename to app/views/cooperates/_partner_item.html.erb index 993c6db3..a094c452 100644 --- a/app/views/managements/_users_list.html.erb +++ b/app/views/cooperates/_partner_item.html.erb @@ -9,29 +9,26 @@ 使用详情