diff --git a/app/models/school.rb b/app/models/school.rb index 7dbf5e3a8..a180eefbe 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -1,4 +1,8 @@ class School < ActiveRecord::Base attr_accessible :name, :province has_many :courses + + def to_s + self.name.to_s + end end diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 968752ed5..41e0c2a12 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -160,7 +160,7 @@ <% unless @course.teacher.user_extensions.nil?%> - <%= l(:label_teacher_work_unit) %> :<%= @course.teacher.user_extensions.occupation %> + <%= l(:label_teacher_work_unit) %> :<%= @course.teacher.user_extensions.school %> <% else %> diff --git a/config/routes.rb b/config/routes.rb index a64acb2c6..62d773077 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -127,6 +127,7 @@ RedmineApp::Application.routes.draw do match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register' match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password' match 'account/activate', :to => 'account#activate', :via => :get + match 'account/valid_ajax', :to => 'account#valid_ajax', :via => :get match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put] match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put]