From 27c5e47ed31e32c3a501d2519cdd72336a94c28d Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Thu, 12 Feb 2015 16:51:18 +0000
Subject: [PATCH] added a new status code - testing

---
 codepot/etc/codepot.mysql                     | 37 +++++++++++++++++++
 .../codepot/language/english/issue_lang.php   |  3 +-
 .../codepot/language/korean/issue_lang.php    |  3 +-
 codepot/src/codepot/libraries/issuehelper.php |  8 +++-
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/codepot/etc/codepot.mysql b/codepot/etc/codepot.mysql
index 5fabf307..88e30b4e 100644
--- a/codepot/etc/codepot.mysql
+++ b/codepot/etc/codepot.mysql
@@ -94,6 +94,24 @@ CREATE TABLE issue (
 		ON DELETE RESTRICT ON UPDATE CASCADE
 ) charset=utf8 engine=InnoDB;
 
+CREATE TABLE issue_attachment (
+	projectid  VARCHAR(32)   NOT NULL,
+	issueid    BIGINT        NOT NULL,
+	name       VARCHAR(255)  NOT NULL,
+	encname    VARCHAR(255)  NOT NULL,
+
+	createdon  DATETIME      NOT NULL,
+	createdby  VARCHAR(32)   NOT NULL,
+
+	UNIQUE KEY issue_attachment_id (projectid, issueid, name),
+
+	CONSTRAINT issue_attachment_projectid FOREIGN KEY (projectid) REFERENCES project(id)
+		ON DELETE RESTRICT ON UPDATE CASCADE,
+
+	CONSTRAINT issue_attachment_issueid FOREIGN KEY (projectid,issueid) REFERENCES issue(projectid,id)
+		ON DELETE RESTRICT ON UPDATE CASCADE
+) charset=utf8 engine=InnoDB;
+
 CREATE TABLE issue_change (
 	projectid VARCHAR(32)  NOT NULL,
 	id        BIGINT       NOT NULL,
@@ -116,6 +134,25 @@ CREATE TABLE issue_change (
 
 ) charset=utf8 engine=InnoDB;
 
+CREATE TABLE issue_change_attachment (
+	projectid  VARCHAR(32)   NOT NULL,
+	issueid    BIGINT        NOT NULL,
+	issuesno   BIGINT        NOT NULL,
+	name       VARCHAR(255)  NOT NULL,
+	encname    VARCHAR(255)  NOT NULL,
+
+	createdon  DATETIME      NOT NULL,
+	createdby  VARCHAR(32)   NOT NULL,
+
+	UNIQUE KEY issue_change_attachment_id (projectid, issueid, name),
+
+	CONSTRAINT issue_change_attachment_projectid FOREIGN KEY (projectid) REFERENCES project(id)
+		ON DELETE RESTRICT ON UPDATE CASCADE,
+
+	CONSTRAINT issue_change_attachment_issueidsno FOREIGN KEY (projectid,issueid,issuesno) REFERENCES issue_change(projectid,id,sno)
+		ON DELETE RESTRICT ON UPDATE CASCADE
+) charset=utf8 engine=InnoDB;
+
 CREATE TABLE file (
 	projectid   VARCHAR(32)   NOT NULL,
 	name        VARCHAR(255)  NOT NULL,
diff --git a/codepot/src/codepot/language/english/issue_lang.php b/codepot/src/codepot/language/english/issue_lang.php
index 41695d94..6abc0335 100644
--- a/codepot/src/codepot/language/english/issue_lang.php
+++ b/codepot/src/codepot/language/english/issue_lang.php
@@ -7,8 +7,9 @@ $lang['ISSUE_STATUS_NEW'] = 'New';
 $lang['ISSUE_STATUS_OTHER'] = 'Other';
 $lang['ISSUE_STATUS_ACCEPTED'] = 'Accepted';
 $lang['ISSUE_STATUS_REJECTED'] = 'Rejected';
-$lang['ISSUE_STATUS_STARTED'] = 'Started';
+$lang['ISSUE_STATUS_STARTED'] = 'In progress';
 $lang['ISSUE_STATUS_STALLED'] = 'Stalled';
+$lang['ISSUE_STATUS_TESTING'] = 'Testing';
 $lang['ISSUE_STATUS_RESOLVED'] = 'Resolved';
 $lang['ISSUE_STATUS_WORKED_AROUND'] = 'Worked-around';
 
diff --git a/codepot/src/codepot/language/korean/issue_lang.php b/codepot/src/codepot/language/korean/issue_lang.php
index fafbdc1e..84688abc 100644
--- a/codepot/src/codepot/language/korean/issue_lang.php
+++ b/codepot/src/codepot/language/korean/issue_lang.php
@@ -7,8 +7,9 @@ $lang['ISSUE_STATUS_NEW'] = '신규';
 $lang['ISSUE_STATUS_OTHER'] = '기타';
 $lang['ISSUE_STATUS_ACCEPTED'] = '승인';
 $lang['ISSUE_STATUS_REJECTED'] = '거부';
-$lang['ISSUE_STATUS_STARTED'] = '시작';
+$lang['ISSUE_STATUS_STARTED'] = '작업중';
 $lang['ISSUE_STATUS_STALLED'] = '지연';
+$lang['ISSUE_STATUS_TESTING'] = '시험중';
 $lang['ISSUE_STATUS_RESOLVED'] = '해결';
 $lang['ISSUE_STATUS_WORKED_AROUND'] = '땜질';
 
diff --git a/codepot/src/codepot/libraries/issuehelper.php b/codepot/src/codepot/libraries/issuehelper.php
index 08123eac..6566320f 100644
--- a/codepot/src/codepot/libraries/issuehelper.php
+++ b/codepot/src/codepot/libraries/issuehelper.php
@@ -17,8 +17,10 @@ class IssueHelper
 	var $STATUS_STARTED    = 'started';
 	// the work can be stalled for various reasons during progress
 	var $STATUS_STALLED    = 'stalled'; 
+	var $STATUS_TESTING    = 'testing'; 
+
 	var $STATUS_RESOLVED   = 'resolved';
-        var $STATUS_WORKED_AROUND   = 'worked-around';
+	var $STATUS_WORKED_AROUND   = 'worked-around';
 
 
 	var $PRIORITY_CRITICAL = 'critical';
@@ -58,6 +60,8 @@ class IssueHelper
 				$lang->line('ISSUE_STATUS_STARTED'),
 			$this->STATUS_STALLED   => 
 				$lang->line('ISSUE_STATUS_STALLED'),
+			$this->STATUS_TESTING   => 
+				$lang->line('ISSUE_STATUS_TESTING'),
 			$this->STATUS_RESOLVED  => 
 				$lang->line('ISSUE_STATUS_RESOLVED'),
 			$this->STATUS_WORKED_AROUND  => 
@@ -76,6 +80,8 @@ class IssueHelper
 				$lang->line('ISSUE_STATUS_STARTED'),
 			$this->STATUS_STALLED   => 
 				$lang->line('ISSUE_STATUS_STALLED')
+			$this->STATUS_TESTING   => 
+				$lang->line('ISSUE_STATUS_TESTING')
 		);
 	}