diff --git a/Taskodrome/files/scripts/column_handler.js b/Taskodrome/files/scripts/column_handler.js
index e9e9e31..24a86ce 100644
--- a/Taskodrome/files/scripts/column_handler.js
+++ b/Taskodrome/files/scripts/column_handler.js
@@ -7,8 +7,10 @@ function ColumnHandler(/** @type {Array.} */headers, canvasWidth) {
this.getColumnIndex = function(name) {
for (var i = 0; i != headers.length; ++i) {
- if (headers[i].toLowerCase() == name.toLowerCase()) {
- return i;
+ if(name != undefined) {
+ if (headers[i].toLowerCase() == name.toLowerCase()) {
+ return i;
+ }
}
}
return -1;
@@ -29,4 +31,4 @@ function ColumnHandler(/** @type {Array.} */headers, canvasWidth) {
}
return m_columnWidth;
};
-};
\ No newline at end of file
+};
diff --git a/Taskodrome/files/scripts/data_source.js b/Taskodrome/files/scripts/data_source.js
index 248533c..8689dc0 100644
--- a/Taskodrome/files/scripts/data_source.js
+++ b/Taskodrome/files/scripts/data_source.js
@@ -38,7 +38,8 @@ var DataSource = (function() {
priority: el.getAttribute("priority"),
priorityCode: parseInt(el.getAttribute("priorityCode"), 10),
reproducibility: el.getAttribute("reproducibility"),
- version: el.getAttribute("version")
+ version: el.getAttribute("version"),
+ relation: el.getAttribute("relation")
};
}
@@ -260,8 +261,7 @@ var DataSource = (function() {
for (var i = 0; i != rels.length; ++i) {
var el = rels[i];
- if (el.getAttribute("src_project_id") == el.getAttribute("dest_project_id")
- && el.getAttribute("type") == 2) {
+ if (el.getAttribute("type") == 2) {
ret.push({ id : parseInt(el.getAttribute("id"), 10),
src_project_id : parseInt(el.getAttribute("src_project_id"), 10),
dest_project_id : parseInt(el.getAttribute("dest_project_id"), 10),
@@ -336,4 +336,4 @@ var DataSource = (function() {
return m_inst || (m_inst = CreateInst());
}
};
-})();
\ No newline at end of file
+})();
diff --git a/Taskodrome/files/scripts/dev_page.js b/Taskodrome/files/scripts/dev_page.js
index 8598df1..616ab03 100644
--- a/Taskodrome/files/scripts/dev_page.js
+++ b/Taskodrome/files/scripts/dev_page.js
@@ -51,7 +51,7 @@ var DevPage = (function() {
grid.addBlock(new Block(version, columnHandler, page));
function addIssue(issue) {
- if (issue.version == version) {
+ if (issue.version == version && issue.relation == "no") {
grid.addCard(new Card(issue.id, DataSource.Inst().UserName(issue.handler_id), issue.version, issue.summary, issue.description, issue.severity, issue.priority, issue.priorityCode, issue.reproducibility, issue.updateTime, issue.status,
false,
m_cardTransferHandler, columnHandler, page));
@@ -118,4 +118,4 @@ var DevPage = (function() {
return m_inst || (m_inst = CreateInst());
}
};
-})();
\ No newline at end of file
+})();
diff --git a/Taskodrome/files/scripts/status_page.js b/Taskodrome/files/scripts/status_page.js
index 5ac397b..f72f6de 100644
--- a/Taskodrome/files/scripts/status_page.js
+++ b/Taskodrome/files/scripts/status_page.js
@@ -45,7 +45,7 @@ var StatusPage = (function() {
grid.addBlock(new Block(version, columnHandler, page));
function addIssue(issue) {
- if (issue.version == version) {
+ if (issue.version == version && issue.relation == "no") {
var card = new Card(issue.id, DataSource.Inst().UserName(issue.handler_id), issue.version, issue.summary, issue.description, issue.severity, issue.priority, issue.priorityCode, issue.reproducibility, issue.updateTime, issue.status,
true,
m_cardTransferHandler, columnHandler, page);
diff --git a/Taskodrome/pages/main.php b/Taskodrome/pages/main.php
index b18f0b3..63089a4 100644
--- a/Taskodrome/pages/main.php
+++ b/Taskodrome/pages/main.php
@@ -87,6 +87,30 @@ function write_bug_rows( $p_rows )
$relationships_html .= 'dest_bug_id="'.$rels[$rel_i]->dest_bug_id.'" ';
$relationships_html .= 'type="'.$rels[$rel_i]->type.'" ';
$relationships_html .= '>
';
+
+ foreach($rels as $key => $value) {
+ $row_rel = bug_get_extended_row($value->dest_bug_id);
+ if($row_rel['status'] < 90 ) {
+ $issues_array_html .= 'priority.'" ';
$issues_array_html .= 'reproducibility="'.get_enum_element('reproducibility', $t_row->reproducibility).'" ';
$issues_array_html .= 'version="'.$t_row->target_version.'" ';
+ $issues_array_html .= 'relation="no" ';
$issues_array_html .= '>
';
$t_row_statuses = get_status_option_list(access_get_project_level( $t_row->project_id ), $t_row->status, true, false, $t_row->project_id);