From a101be344c615ec5a1123c1a2f332d0bad43ee2c Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Mon, 11 Nov 2013 09:06:53 +0800
Subject: [PATCH] add any remark

---
 app/controllers/projects_controller.rb   |  6 ++++--
 app/views/projects/_member_list.html.erb |  1 +
 config/database.yml                      | 12 ++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 72501c8c7..5b9de9217 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -491,7 +491,9 @@ class ProjectsController < ApplicationController
     @trackers = Tracker.sorted.all
     @project = Project.new
     @project.safe_attributes = params[:project]
-    ##add by huang
+
+    ##TODO: , viewed by nyan 
+    ##add by huang 
     @course=Course.new
     @course.safe_attributes = params[:course]
     ##end
@@ -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) }
diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb
index ed2f6c11e..9040b6a51 100644
--- a/app/views/projects/_member_list.html.erb
+++ b/app/views/projects/_member_list.html.erb
@@ -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>
diff --git a/config/database.yml b/config/database.yml
index 131ff070c..c8199efdb 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -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"