From: dibs <dibs@samsung.com>
Date: Thu, 28 Mar 2013 08:31:26 +0000 (+0900)
Subject: [DIBS web] change admin project password check
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d72fe39a2b7079ddce9e4838d3facf4bd44383e;p=sdk%2Ftools%2Fsdk-build.git

[DIBS web] change admin project password check
---

diff --git a/dibs-web/app/controllers/admin_project_controller.rb b/dibs-web/app/controllers/admin_project_controller.rb
index 7f7d5b4..7c67a69 100644
--- a/dibs-web/app/controllers/admin_project_controller.rb
+++ b/dibs-web/app/controllers/admin_project_controller.rb
@@ -80,6 +80,7 @@ class AdminProjectController < ApplicationController
 													     , projects.name 
 													     , projects.ptype
 													     , projects.status
+													     , projects.password
 													  FROM projects
 														 , distributions
 													 WHERE distributions.name = \"#{dist_name}\"
@@ -91,6 +92,7 @@ class AdminProjectController < ApplicationController
 						doc.ProjectName(project.name)
 						doc.Type(project.ptype)
 						doc.ProjectStatus(project.status)
+						doc.ProjectPassword(project.password)
             
 						os_list = ProjectOs.find_by_sql("SELECT supported_os.name AS name
 														   FROM project_os
diff --git a/dibs-web/public/javascripts/admin-project-modify.js b/dibs-web/public/javascripts/admin-project-modify.js
index 338d83d..c4795b6 100644
--- a/dibs-web/public/javascripts/admin-project-modify.js
+++ b/dibs-web/public/javascripts/admin-project-modify.js
@@ -29,11 +29,12 @@ Contributors:
 function adminProjectModifyBinaryProjectInit() {
 	var projectName = localStorage.projectName;
 	var packageName = $("#adminProject-binary-packageName-"+projectName).html();
-	var projectStatusText = $("#adminProject-binary-"+projectName+"-status").html();
+	var projectStatus = $("#adminProject-binary-"+projectName+"-status").html();
+	var projectPassword = $("#adminProject-binary-"+projectName+"-password").html();
 
 	$("#adminProjectModifyBinary-oldName").val(projectName);
 	$("#adminProjectModifyBinary-newName").val(projectName);
-	$("#adminProjectModifyBinary-password").val("");
+	$("#adminProjectModifyBinary-password").val(projectPassword);
 	$("#adminProjectModifyBinary-packageName").val(packageName);
 	$("#adminProjectModifyBinary-status").empty();
 	$("#adminProjectModifyBinary-os").empty();
@@ -41,14 +42,14 @@ function adminProjectModifyBinaryProjectInit() {
 
 	$("#adminProjectModifyBinary-status").empty();
 	var option; 
-	if(projectStatusText.toUpperCase() == "OPEN") {
+	if(projectStatus.toUpperCase() == "OPEN") {
 		option = '<option value="OPEN" selected="selected">OPEN</option>';
 	} else {
 		option = '<option value="OPEN">OPEN</option>';
 	}
 	$("#adminProjectModifyBinary-status").append(option);
 	
-	if(projectStatusText.toUpperCase() == "CLOSE") {
+	if(projectStatus.toUpperCase() == "CLOSE") {
 		option = '<option value="CLOSE" selected="selected">CLOSE</option>';
 	} else {
 		option = '<option value="CLOSE">CLOSE</option>';
@@ -91,25 +92,26 @@ function adminProjectModifyGitProjectInit() {
 	var projectName = localStorage.projectName;
 	var projectAddress = $("#adminProject-git-"+projectName+"-address").html();
 	var projectBranch = $("#adminProject-git-"+projectName+"-branch").html();
-	var projectStatusText = $("#adminProject-git-"+projectName+"-status").html();
+	var projectStatus = $("#adminProject-git-"+projectName+"-status").html();
+	var projectPassword = $("#adminProject-git-"+projectName+"-password").html();
 
 	$("#adminProjectModifyGit-oldName").val(projectName);
 	$("#adminProjectModifyGit-newName").val(projectName);
-	$("#adminProjectModifyGit-password").val("");
+	$("#adminProjectModifyGit-password").val(projectPassword);
 	$("#adminProjectModifyGit-address").val(projectAddress);
 	$("#adminProjectModifyGit-branch").val(projectBranch);
 	$("#adminProjectModifyGit-status").empty();
 	$("#adminProjectModifyGit-os").empty();
 	$("#adminProjectModifyGit-os").append("<legend> os list </legend>");
 	var option; 
-	if(projectStatusText.toUpperCase() == "OPEN") {
+	if(projectStatus.toUpperCase() == "OPEN") {
 		option = '<option value="OPEN" selected="selected">OPEN</option>';
 	} else {
 		option = '<option value="OPEN">OPEN</option>';
 	}
 	$("#adminProjectModifyGit-status").append(option);
 	
-	if(projectStatusText.toUpperCase() == "CLOSE") {
+	if(projectStatus.toUpperCase() == "CLOSE") {
 		option = '<option value="CLOSE" selected="selected">CLOSE</option>';
 	} else {
 		option = '<option value="CLOSE">CLOSE</option>';
diff --git a/dibs-web/public/javascripts/admin-project.js b/dibs-web/public/javascripts/admin-project.js
index b09953a..195b821 100644
--- a/dibs-web/public/javascripts/admin-project.js
+++ b/dibs-web/public/javascripts/admin-project.js
@@ -108,7 +108,8 @@ function adminProjectUpdateTable(projectList) {
 	projectList.each(function(){
 		var name = $(this).find("ProjectName").text();
 		var type = $(this).find("Type").text();
-		var project_status = $(this).find("ProjectStatus").text();
+		var projectStatus = $(this).find("ProjectStatus").text();
+		var projectPassword = $(this).find("ProjectPassword").text();
 		var osList = $(this).find("OS");
 
 		if(type.toUpperCase() == "GIT")
@@ -136,7 +137,12 @@ function adminProjectUpdateTable(projectList) {
 
 			cell = row.insertCell(-1);
 			cell.setAttribute('id',"adminProject-git-"+name+"-status");
-			cell.innerHTML = project_status;
+			cell.innerHTML = projectStatus;
+
+			cell = row.insertCell(-1);
+			cell.setAttribute('hidden',"hidden");
+			cell.setAttribute('id',"adminProject-git-"+name+"-password");
+			cell.innerHTML = projectPassword;
 
 			cell = row.insertCell(-1);
 			var button = document.createElement('a');
@@ -180,7 +186,12 @@ function adminProjectUpdateTable(projectList) {
 
 			cell = row.insertCell(-1);
 			cell.setAttribute('id',"adminProject-binary-"+name+"-status");
-			cell.innerHTML = project_status;
+			cell.innerHTML = projectStatus;
+
+			cell = row.insertCell(-1);
+			cell.setAttribute('hidden',"hidden");
+			cell.setAttribute('id',"adminProject-binary-"+name+"-password");
+			cell.innerHTML = projectPassword;
 
 			cell = row.insertCell(-1);
 			var button = document.createElement('a');