From cc21edbd24f897ef50a2ab8125ecff512a4a7656 Mon Sep 17 00:00:00 2001 From: Sungmin Kim Date: Wed, 11 Jun 2014 14:17:09 +0900 Subject: [PATCH] Add git project's information in project page. Signed-off-by: Sungmin Kim Change-Id: Ifdf348c0df6c8063e6bf992173caecaed862d50b --- dibs-web/app/controllers/projects_controller.rb | 11 ++++++++++- dibs-web/public/javascripts/projects.js | 8 +++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dibs-web/app/controllers/projects_controller.rb b/dibs-web/app/controllers/projects_controller.rb index 47c69e7..7bfe607 100644 --- a/dibs-web/app/controllers/projects_controller.rb +++ b/dibs-web/app/controllers/projects_controller.rb @@ -159,9 +159,13 @@ class ProjectsController < ApplicationController , projects.ptype AS project_type , projects.id AS project_id , users.email AS maintainer + , project_gits.git_repos AS git_repos + , project_gits.git_branch AS git_branch FROM projects - LEFT JOIN users + LEFT JOIN users ON users.id = projects.user_id + LEFT JOIN project_gits + ON projects.id = project_gits.project_id WHERE projects.distribution_id = #{dist_id} ORDER BY projects.name") @@ -178,6 +182,11 @@ class ProjectsController < ApplicationController doc.Type(project.project_type) doc.Maintainer(project.maintainer) + if project.project_type.eql? "GIT" then + doc.GitAddress(project.git_repos) + doc.GitBranch(project.git_branch) + end + if checkUserAccessProject(user_id, project.project_id) doc.GroupAccess("TRUE") else diff --git a/dibs-web/public/javascripts/projects.js b/dibs-web/public/javascripts/projects.js index 1aa86c6..eaeead1 100644 --- a/dibs-web/public/javascripts/projects.js +++ b/dibs-web/public/javascripts/projects.js @@ -101,6 +101,8 @@ function projectsAppendProjectList( project, projectList ) { var type = project.find("Type").text(); var groupAccess = project.find("GroupAccess").text(); var maintainer = project.find("Maintainer").text(); + var git_address = project.find("GitAddress").text(); + var git_branch = project.find("GitBranch").text(); var div = document.createElement('div'); div.setAttribute('data-role', 'collapsible'); @@ -121,7 +123,11 @@ function projectsAppendProjectList( project, projectList ) { var infoLine = document.createElement('p'); infoLine.setAttribute('style', 'font-size: 12px'); - infoLine.innerHTML = "Maintainer : "+maintainer+"

"; + infoLine.innerHTML = "Maintainer: "+maintainer+"

"; + if(type === "GIT") { + infoLine.innerHTML += "Git address: "+git_address+"

"; + infoLine.innerHTML += "Git branch: "+git_branch+"

"; + } div.appendChild(infoLine); var ul = document.createElement('ul'); -- 2.7.4