建立了学校与用户的关联

课程与用户的学校字段均为学校id而不再是学校名称

页面暂时改了想到的地方= =
exceptionHandle
Wen 12 years ago
parent 7c8ecd1944
commit 5699a947ec

@ -87,7 +87,7 @@ class MyController < ApplicationController
se = UserExtensions.new
se.user_id = @user.id
if params[:occupation]
se.occupation = params[:occupation]
se.school_id = params[:occupation]
end
se.gender = params[:gender]
@ -109,7 +109,7 @@ class MyController < ApplicationController
else
se = @user.user_extensions
if params[:occupation]
se.occupation = params[:occupation]
se.school_id = params[:occupation]
end
se.gender = params[:gender]

@ -390,7 +390,7 @@ class ProjectsController < ApplicationController
# added by bai
@course.term = params[:term]
@course.time = params[:time]
@course.school_name = params[:occupation]
@course.school_id = params[:occupation]
@course.setup_time = params[:setup_time]
@course.endup_time = params[:endup_time]
@course.class_period = params[:class_period]

@ -6,7 +6,7 @@ class SchoolController < ApplicationController
options = ""
@school.each do |s|
options << "<option value=#{s.name}>#{s.name}</option>"
options << "<option value=#{s.id}>#{s.name}</option>"
end
render :text => options

@ -8,6 +8,7 @@
=end
class UserExtensions < ActiveRecord::Base
belongs_to :user
belongs_to :school, :class_name => 'School', :foreign_key => :school_id
attr_accessible :user_id,:birthday,:brief_introduction,:gender,:location,:occupation,:work_experience,:zip_code,:identity, :technical_title,:student_id
TEACHER = 0
STUDENT = 1

File diff suppressed because it is too large Load Diff

@ -91,7 +91,7 @@
<p style="width:357px;padding-left: 26px;">
<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %>
<%= select_tag "occupation", options_for_select([['安徽大学','安徽大学'],['合肥工业大学','合肥工业大学'],['中国科技大学','中国科技大学']]) %>
<%= select_tag "occupation" %>
</p>

@ -289,7 +289,7 @@
<strong><%=l(:label_new_course_school)%></strong><span class="required">*</span>&nbsp;&nbsp;&nbsp;
<%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onclick => "get_options(this.value)" %>
<%= select_tag "occupation", options_for_select([['安徽大学','安徽大学'],['合肥工业大学','合肥工业大学'],['中国科技大学','中国科技大学']]) %>
<%= select_tag "occupation" %>
</p>
<!-- end -->

@ -0,0 +1,9 @@
class RenameCoursesColumnSchoolName < ActiveRecord::Migration
def up
rename_column :courses, :school_name, :school_id
end
def down
rename_column :courses, :school_id, :school_name
end
end

@ -0,0 +1,9 @@
class ChangeCoursesColumnSchoolId < ActiveRecord::Migration
def up
change_column :courses, :school_id, :integer
end
def down
change_column :courses, :school_id, :string
end
end

@ -0,0 +1,5 @@
class AddSchoolIdToUserExtensions < ActiveRecord::Migration
def change
add_column :user_extensions, :school_id, :integer
end
end

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save