Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts: app/models/user.rb app/views/courses/_course_form.html.erb db/schema.rbcourse_group
commit
460ba55dde
@ -1,3 +1,3 @@
|
||||
<%= error_messages_for 'bid' %>
|
||||
<p><%= f.text_field :content, :required => true, :size => 60, :style => "width:150px;" %></p>
|
||||
<p><%= hidden_field_tag 'subject', ||=@memo.subject %>
|
||||
<p><%= hidden_field_tag 'subject'||=@memo.subject %>
|
||||
@ -1,5 +1,6 @@
|
||||
class ChangeBidsDescriptionType < ActiveRecord::Migration
|
||||
def change
|
||||
change_column :bids, :description, :text, default: nil
|
||||
end
|
||||
end
|
||||
#encoding=UTF-8
|
||||
class ChangeBidsDescriptionType < ActiveRecord::Migration
|
||||
def change
|
||||
change_column :bids, :description, :text, default: nil
|
||||
end
|
||||
end
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
#encoding=UTF-8
|
||||
class ChangeDataForCourses < ActiveRecord::Migration
|
||||
def up
|
||||
sql = "UPDATE courses set school_id = 117 where id =58"
|
||||
execute(sql)
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,11 @@
|
||||
#encoding=UTF-8
|
||||
class ChangeSchoolIdForSchool < ActiveRecord::Migration
|
||||
def up
|
||||
sql = "update courses, user_extensions set courses.school_id = user_extensions.school_id
|
||||
where courses.tea_id = user_extensions.user_id"
|
||||
execute(sql)
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,6 @@
|
||||
class AddColumnToForums < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :forums, :sticky, :integer
|
||||
add_column :forums, :locked, :integer
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,9 @@
|
||||
class SetStickyLockedForForum < ActiveRecord::Migration
|
||||
def up
|
||||
sql = "update forums set sticky=0, locked = 0 "
|
||||
execute(sql)
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,29 @@
|
||||
#encoding=UTF-8
|
||||
class AddDataForSchoolName < ActiveRecord::Migration
|
||||
def up
|
||||
sql = " Insert into schools (name, province, logo_link, created_at, updated_at) values
|
||||
('香港大学','香港','/images/transparent.png', NOW(),NOW()),
|
||||
('香港大学','香港','/images/transparent.png',NOW(),NOW()),
|
||||
('香港中文大学','香港','/images/transparent.png',NOW(),NOW()),
|
||||
('香港科技大学','香港','/images/transparent.png',NOW(),NOW()),('香港理工大学','香港','/images/transparent.png',NOW(),NOW()),
|
||||
('香港城市大学','香港','/images/transparent.png',NOW(),NOW()),('香港浸会大学','香港','/images/transparent.png',NOW(),NOW()),
|
||||
('香港教育学院','香港','/images/transparent.png',NOW(),NOW()),('香港歌德学院','香港','/images/transparent.png',NOW(),NOW()),
|
||||
('香港岭南大学','香港','/images/transparent.png',NOW(),NOW()),('澳门大学','澳门','/images/transparent.png',NOW(),NOW()),
|
||||
('澳门理工学院','澳门','/images/transparent.png',NOW(),NOW()),('澳门科技大学','澳门','/images/transparent.png',NOW(),NOW()),
|
||||
('澳门保安部队高等学校','澳门','/images/transparent.png',NOW(),NOW()),('亚洲国际公开大学','澳门','/images/transparent.png',NOW(),NOW()),
|
||||
('澳门旅游学院','澳门','/images/transparent.png',NOW(),NOW()),('清华大学(新竹)','台湾','/images/transparent.png',NOW(),NOW()),
|
||||
('台湾大学','台湾','/images/transparent.png',NOW(),NOW()),('交通大学','台湾','/images/transparent.png',NOW(),NOW()),
|
||||
('中央大学','台湾','/images/transparent.png',NOW(),NOW()),('成功大学','台湾','/images/transparent.png',NOW(),NOW()),
|
||||
('中山大学','台湾','/images/transparent.png',NOW(),NOW()),('中原大学','台湾','/images/transparent.png',NOW(),NOW()),
|
||||
('政治大学','台湾','/images/transparent.png',NOW(),NOW()),('元智大学','台湾','/images/transparent.png',NOW(),NOW()),
|
||||
('天主教辅仁大学','台湾','/images/transparent.png',NOW(),NOW()),('台湾科技大学','台湾','/images/transparent.png',NOW(),NOW()),
|
||||
('台湾师范大学','台湾','/images/transparent.png',NOW(),NOW()),('台湾艺术大学','台湾','/images/transparent.png',NOW(),NOW())"
|
||||
execute(sql)
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue