p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixtures fix, header fix dynamic.

This commit is contained in:
yanxd 2014-02-19 17:23:24 +08:00
parent b06d5c13a8
commit 3d274be77b
3 changed files with 59 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/layouts/_base_header.html.erb
View File

@ -12,10 +12,10 @@
<%=link_to_user(User.current)%> <%=link_to_user(User.current)%>
<ul class="sub_menu"> <ul class="sub_menu">
<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%> <% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
<li><%=link_to l(:label_my_course), user_courses_user_path(User.current), target:'my_path' %></li> <li><%=link_to l(:label_my_course), user_courses_user_path(User.current) %></li>
<% end -%> <% end -%>
<li><%=link_to l(:label_my_projects), user_projects_user_path(User.current), target:'my_path' %></li> <li><%=link_to l(:label_my_projects), user_projects_user_path(User.current) %></li>
<li><%=link_to l(:label_user_edit), my_account_path, target:'my_path' %></li> <li><%=link_to l(:label_user_edit), my_account_path %></li>
</ul> </ul>
</li> </li>
<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;"> <li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">

104
config/database.yml.example
View File

@ -1,52 +1,52 @@
# Default setup is given for MySQL with ruby1.9. If you're running Redmine # Default setup is given for MySQL with ruby1.9. If you're running Redmine
# with MySQL and ruby1.8, replace the adapter name with `mysql`. # with MySQL and ruby1.8, replace the adapter name with `mysql`.
# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end. # Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
# Line indentation must be 2 spaces (no tabs). # Line indentation must be 2 spaces (no tabs).
production: production:
adapter: mysql2 adapter: mysql2
database: redmine database: redmine
host: localhost host: localhost
username: root username: root
password: "" password: ""
encoding: utf8 encoding: utf8
development: development:
adapter: mysql2 adapter: mysql2
database: redmine_development database: redmine_development
host: localhost host: 10.107.17.20
username: root username: root
password: "" password: "1234"
encoding: utf8 encoding: utf8
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
adapter: mysql2 adapter: mysql2
database: redmine_test database: redmine_test
host: localhost host: 10.107.17.20
username: root username: root
password: "" password: "1234"
encoding: utf8 encoding: utf8
# PostgreSQL configuration example # PostgreSQL configuration example
#production: #production:
# adapter: postgresql # adapter: postgresql
# database: redmine # database: redmine
# host: localhost # host: localhost
# username: postgres # username: postgres
# password: "postgres" # password: "postgres"
# SQLite3 configuration example # SQLite3 configuration example
#production: #production:
# adapter: sqlite3 # adapter: sqlite3
# database: db/redmine.sqlite3 # database: db/redmine.sqlite3
# SQL Server configuration example # SQL Server configuration example
#production: #production:
# adapter: sqlserver # adapter: sqlserver
# database: redmine # database: redmine
# host: localhost # host: localhost
# username: jenkins # username: jenkins
# password: jenkins # password: jenkins

29
test/fixtures/courses.yml vendored
View File

@ -10,7 +10,7 @@ courses_006:
created_at: 2013-09-30 08:11:15.000000000 +08:00 created_at: 2013-09-30 08:11:15.000000000 +08:00
updated_at: 2013-10-11 12:34:29.000000000 +08:00 updated_at: 2013-10-11 12:34:29.000000000 +08:00
location: location:
term: 秋季学期 term: "秋季学期"
string: string:
password: software password: software
setup_time: setup_time:
@ -27,7 +27,7 @@ courses_004:
created_at: 2013-09-27 11:16:11.000000000 +08:00 created_at: 2013-09-27 11:16:11.000000000 +08:00
updated_at: 2013-12-21 10:55:20.000000000 +08:00 updated_at: 2013-12-21 10:55:20.000000000 +08:00
location: location:
term: 秋季学期 term: "秋季学期"
string: string:
password: '123456' password: '123456'
setup_time: '' setup_time: ''
@ -44,7 +44,7 @@ courses_012:
created_at: 2013-10-08 20:52:10.000000000 +08:00 created_at: 2013-10-08 20:52:10.000000000 +08:00
updated_at: 2013-10-08 20:52:10.000000000 +08:00 updated_at: 2013-10-08 20:52:10.000000000 +08:00
location: location:
term: 秋季学期 term: "秋季学期"
string: string:
password: software password: software
setup_time: setup_time:
@ -61,30 +61,9 @@ courses_020:
created_at: 2013-10-21 20:47:58.000000000 +08:00 created_at: 2013-10-21 20:47:58.000000000 +08:00
updated_at: 2014-01-08 09:48:56.000000000 +08:00 updated_at: 2014-01-08 09:48:56.000000000 +08:00
location: location:
term: 秋季学期 term: '秋季学期'
string: string:
password: multi-agent password: multi-agent
setup_time: '' setup_time: ''
endup_time: '' endup_time: ''
class_period: '' class_period: ''