[evolvis-commits] r18646: Strike-through closed/deleted tasks and tracker items in Browse
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Sep 25 17:03:52 CEST 2012
Author: mirabilos
Date: 2012-09-25 17:03:51 +0200 (Tue, 25 Sep 2012)
New Revision: 18646
Modified:
trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
Log:
Strike-through closed/deleted tasks and tracker items in Browse
Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-09-25 15:03:45 UTC (rev 18645)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog 2012-09-25 15:03:51 UTC (rev 18646)
@@ -30,8 +30,9 @@
* Revive robots.txt file from (4.8) 35 except now /etc/gforge/custom
* [#3205] Clean up dependencies for/and require Debian wheezy
* Really accept Tasks/Tracker mails on *-discuss by default
+ * Strike-through closed/deleted tasks and tracker items
- -- Thorsten Glaser <t.glaser at tarent.de> Tue, 25 Sep 2012 15:55:50 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de> Tue, 25 Sep 2012 16:33:27 +0200
fusionforge (1:5.1.1+evolvis69) unstable; urgency=medium
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php 2012-09-25 15:03:45 UTC (rev 18645)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php 2012-09-25 15:03:51 UTC (rev 18646)
@@ -458,16 +458,19 @@
}
}
+ $st = $pt_arr[$i]->getStatusId();
echo '
- <tr class=" '. (($pt_arr[$i]->getStatusId() == 7) ? ' copyAndClosed ' : ' priority'.$pt_arr[$i]->getPriority()).'"><td style="width:16px; background-color:#FFFFFF"><div class="hidePartForPrinting">' .
+ <tr class=" '. (($st == 7) ? ' copyAndClosed ' : ' priority'.$pt_arr[$i]->getPriority()).'"><td style="width:16px; background-color:#FFFFFF"><div class="hidePartForPrinting">' .
util_make_link("/export/rssAboTask.php?tid=" .
$pt_arr[$i]->getID(), html_image('ic/rss.png',
16, 16, array('border' => '0'))
) . "</div></td>\n" .
'<td>'.
- ($IS_ADMIN ? '<input type="checkbox"'. (($pt_arr[$i]->getStatusId() == 7) ? ' disabled="disabled" onclick="return false;"':'') .' name="project_group_id_list[]" style="display:none;" value="'. $task_group_project_id .'" /> ':'').
- ($IS_ADMIN ? '<input type="checkbox"'. (($pt_arr[$i]->getStatusId() == 7) ? ' disabled="disabled" onclick="return false;"':'') .' name="project_task_id_list[]" value="'. $pt_arr[$i]->getID() .'" /> ':'').
- $pt_arr[$i]->getID() .'</td>';
+ ($IS_ADMIN ? '<input type="checkbox"'. (($st == 7) ? ' disabled="disabled" onclick="return false;"':'') .' name="project_group_id_list[]" style="display:none;" value="'. $task_group_project_id .'" /> ':'').
+ ($IS_ADMIN ? '<input type="checkbox"'. (($st == 7) ? ' disabled="disabled" onclick="return false;"':'') .' name="project_task_id_list[]" value="'. $pt_arr[$i]->getID() .'" /> ':'').
+ html_e('span', array(
+ 'class' => ($st == 2 || $st == 3 ? 's' : false),
+ ), $pt_arr[$i]->getID()) . "</td>\n";
if ($display_col['summary'])
echo '<td class="separateRowsForPrinting"><a href="'.$url.'">'. util_html_secure($pt_arr[$i]->getSummary()) .'</a></td>';
if ($display_col['start_date']) {
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php 2012-09-25 15:03:45 UTC (rev 18645)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php 2012-09-25 15:03:51 UTC (rev 18646)
@@ -744,17 +744,24 @@
<tr '. $HTML->boxGetAltRowStyle($i) . '>';
foreach ($browse_fields as $f) {
if ($f == 'id') {
+ $c = array('href' => util_gethref(false,
+ array(
+ 'func' => 'detail',
+ 'aid' => $art_arr[$i]->getID(),
+ 'group_id' => $group_id,
+ 'atid' => $ath->getID(),
+ )), 'class' => array());
+ if ($art_arr[$i]->getStatusID() != 1) {
+ $c['class'][] = 's';
+ }
echo html_eo('td', array(
'style' => 'white-space:nowrap;',
'content' => $art_arr[$i]->getID(),
)) .
($IS_ADMIN?'<input type="checkbox" name="artifact_id_list[]" value="'.
$art_arr[$i]->getID() .'" /> ':'').
- '<a href="'.getStringFromServer('PHP_SELF').'?func=detail&aid='.
- $art_arr[$i]->getID() .
- '&group_id='. $group_id .'&atid='.
- $ath->getID().'">'.$art_arr[$i]->getID() .
- '</a></td>';
+ html_e('a', $c, $art_arr[$i]->getID()) .
+ "</td>\n";
} else if ($f == 'summary') {
echo html_eo('td', array(
'content' => $art_arr[$i]->getSummary(),
More information about the evolvis-commits
mailing list