add any remark
This commit is contained in:
parent
6352ae7aa6
commit
a101be344c
|
@ -491,6 +491,8 @@ class ProjectsController < ApplicationController
|
|||
@trackers = Tracker.sorted.all
|
||||
@project = Project.new
|
||||
@project.safe_attributes = params[:project]
|
||||
|
||||
##TODO: , viewed by nyan
|
||||
##add by huang
|
||||
@course=Course.new
|
||||
@course.safe_attributes = params[:course]
|
||||
|
@ -570,7 +572,7 @@ class ProjectsController < ApplicationController
|
|||
format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
|
||||
end
|
||||
else
|
||||
@course.destroy
|
||||
@course.destroy #TODO: yan
|
||||
respond_to do |format|
|
||||
format.html { render :action => 'new', :layout => 'base'}#Added by young
|
||||
format.api { render_validation_errors(@project) }
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
</p>
|
||||
</div>
|
||||
<% else%>
|
||||
<!-- TODO: member.roles unsafe #nyan -->
|
||||
<%= content_tag "div", content_tag("p", member.roles.sort.collect(&:to_s).join(', ')), :class => "clear avatar_name" %>
|
||||
<div class="clear avatar_user">
|
||||
<p>
|
||||
|
|
|
@ -28,8 +28,8 @@ development:
|
|||
# Do not set this db to the same as development or production.
|
||||
test:
|
||||
adapter: mysql2
|
||||
database: bitnami_redmine
|
||||
host: 192.168.83.251
|
||||
database: trustie_test
|
||||
host: 10.107.17.20
|
||||
socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
|
||||
port: 3306
|
||||
username: root
|
||||
|
@ -41,8 +41,8 @@ test:
|
|||
# adapter: mysql2
|
||||
# database: bitnami_redmine
|
||||
# host: localhost
|
||||
socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
|
||||
port: 3306
|
||||
# socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
|
||||
# port: 3306
|
||||
# username: bitnami
|
||||
# password: "c16af1e560"
|
||||
|
||||
|
@ -56,7 +56,7 @@ test:
|
|||
# adapter: mysql2
|
||||
# database: bitnami_redmine
|
||||
# host: localhost
|
||||
socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
|
||||
port: 3306
|
||||
# socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
|
||||
# port: 3306
|
||||
# username: bitnami
|
||||
# password: "c16af1e560"
|
||||
|
|
Loading…
Reference in New Issue