[evolvis-commits] r17094: Merged branch select-comment-order-in-tracker-pm
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 02:02:02 CET 2011
Author: mirabilos
Date: 2011-03-01 02:02:02 +0100 (Tue, 01 Mar 2011)
New Revision: 17094
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php
trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifact.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/pm/detail_task.php
trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/pm/mod_task.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
Log:
Merged branch select-comment-order-in-tracker-pm
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -611,11 +611,11 @@
*
* @return database result set.
*/
- function getMessages() {
+ function getMessages($asc=false) {
return db_query_params ('SELECT *
FROM project_message_user_vw
WHERE project_task_id=$1
- ORDER BY postdate DESC',
+ ORDER BY postdate ' . ($asc ? 'ASC' : 'DESC'),
array ($this->getID())) ;
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifact.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifact.class.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/Artifact.class.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -667,8 +667,8 @@
*
* @return database result set.
*/
- function getMessages() {
- return db_query_params ('SELECT * FROM artifact_message_user_vw WHERE artifact_id=$1 ORDER BY adddate DESC',
+ function getMessages($asc=false) {
+ return db_query_params ('SELECT * FROM artifact_message_user_vw WHERE artifact_id=$1 ORDER BY adddate ' . ($asc ? 'ASC' : 'DESC'),
array ($this->getID())) ;
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/detail_task.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/detail_task.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/detail_task.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -24,6 +24,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+if (getStringFromRequest('commentsort') == 'anti') {
+ $sort_comments_chronologically = false;
+} else {
+ $sort_comments_chronologically = true;
+}
+
pm_header(array('title'=>_('Task Detail'),'group_project_id'=>$group_project_id));
?>
@@ -163,7 +169,7 @@
<tr>
<td colspan="2">
- <?php echo $pt->showMessages(); ?>
+ <?php echo $pt->showMessages($sort_comments_chronologically, "/pm/task.php?func=detailtask&project_task_id=$project_task_id&group_id=$group_id&group_project_id=$group_project_id"); ?>
</td>
</tr>
<?php
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/ProjectTaskHTML.class.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -129,16 +129,27 @@
}
}
- function showMessages() {
+ function showMessages($asc=true,$whereto='/') {
/*
Show the details rows from task_history
*/
- $result=$this->getMessages();
+ $result=$this->getMessages($asc);
$rows=db_numrows($result);
if ($rows > 0) {
- echo '<h3>'._('Followups').'</h3>';
+ echo '<h3>'._('Followups: ');
+ if ($asc) {
+ echo '<a href="' .
+ util_make_url($whereto . '&commentsort=anti') .
+ '">' . _('Sort comments antichronologically') . '</a>';
+ } else {
+ echo '<a href="' .
+ util_make_url($whereto . '&commentsort=chrono') .
+ '">' . _('Sort comments chronologically') . '</a>';
+ }
+ echo "</h3>\n";
+
$title_arr=array();
$title_arr[]=_('Comment');
$title_arr[]=_('Date');
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/mod_task.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/mod_task.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/mod_task.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -29,6 +29,12 @@
require_once $gfcommon.'reporting/report_utils.php';
require_once $gfcommon.'reporting/Report.class.php';
+if (getStringFromRequest('commentsort') == 'anti') {
+ $sort_comments_chronologically = false;
+} else {
+ $sort_comments_chronologically = true;
+}
+
pm_header(array('title'=>_('Modify Task'),'pagename'=>'pm_modtask','group_project_id'=>$group_project_id));
echo notepad_func();
@@ -297,7 +303,7 @@
<tr>
<td colspan="3">
- <?php echo $pt->showMessages(); ?>
+ <?php echo $pt->showMessages($sort_comments_chronologically, "/pm/task.php?func=detailtask&project_task_id=$project_task_id&group_id=$group_id&group_project_id=$group_project_id"); ?>
</td>
</tr>
<?php
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -25,6 +25,12 @@
use_javascript('/tabber/tabber.js');
+if (getStringFromRequest('commentsort') == 'anti') {
+ $sort_comments_chronologically = false;
+} else {
+ $sort_comments_chronologically = true;
+}
+
$ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
echo notepad_func();
@@ -111,9 +117,19 @@
<?php } ?>
</td></tr>
<tr><td colspan="2">
- <h2><?php echo _('Followup') ?></h2>
- <?php
- echo $ah->showMessages();
+ <h2><?php echo _('Followups: ') ;
+ if ($sort_comments_chronologically) {
+ echo '<a href="' .
+ util_make_url('/tracker/index.php?func=detail&aid=' . $aid . '&group_id=' . $group_id . '&atid=' . $ath->getID() . '&commentsort=anti') .
+ '">' . _('Sort comments antichronologically') . '</a>';
+ } else {
+ echo '<a href="' .
+ util_make_url('/tracker/index.php?func=detail&aid=' . $aid . '&group_id=' . $group_id . '&atid=' . $ath->getID() . '&commentsort=chrono') .
+ '">' . _('Sort comments chronologically') . '</a>';
+ }
+ echo '</h2>';
+
+ echo $ah->showMessages($sort_comments_chronologically);
?>
</td></tr>
</table>
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -56,8 +56,8 @@
}
- function showMessages() {
- $result= $this->getMessages();
+ function showMessages($asc=true) {
+ $result= $this->getMessages($asc);
$rows=db_numrows($result);
if ($rows > 0) {
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -24,6 +24,12 @@
*/
use_javascript('/tabber/tabber.js');
+if (getStringFromRequest('commentsort') == 'anti') {
+ $sort_comments_chronologically = false;
+} else {
+ $sort_comments_chronologically = true;
+}
+
$ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
echo notepad_func();
@@ -149,9 +155,18 @@
<br /><strong><?php echo _('OR Attach A Comment') ?>: <?php echo notepad_button('document.forms.trackermodlimitedform.details') ?></strong><br />
<textarea id="tracker-comment" name="details" rows="7" cols="60" title="<?php echo html_get_tooltip_description('comment') ?>"></textarea>
<p>
- <h2><?php echo _('Followup') ?>:</h2>
- <?php
- echo $ah->showMessages();
+ <h2><?php echo _('Followups: ') ;
+ if ($sort_comments_chronologically) {
+ echo '<a href="' .
+ util_make_url('/tracker/index.php?func=detail&aid=' . $aid . '&group_id=' . $group_id . '&atid=' . $ath->getID() . '&commentsort=anti') .
+ '">' . _('Sort comments antichronologically') . '</a>';
+ } else {
+ echo '<a href="' .
+ util_make_url('/tracker/index.php?func=detail&aid=' . $aid . '&group_id=' . $group_id . '&atid=' . $ath->getID() . '&commentsort=chrono') .
+ '">' . _('Sort comments chronologically') . '</a>';
+ }
+echo '</h2>';
+echo $ah->showMessages($sort_comments_chronologically);
?>
</td></tr>
</table>
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php 2011-03-01 01:01:58 UTC (rev 17093)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php 2011-03-01 01:02:02 UTC (rev 17094)
@@ -25,6 +25,12 @@
*/
use_javascript('/tabber/tabber.js');
+if (getStringFromRequest('commentsort') == 'anti') {
+ $sort_comments_chronologically = false;
+} else {
+ $sort_comments_chronologically = true;
+}
+
$ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
echo notepad_func();
@@ -194,9 +200,18 @@
<p>
<strong><?php echo _('OR Attach A Comment') ?>:<?php echo notepad_button('document.forms.trackermodform.details') ?></strong><br />
<textarea id="tracker-comment" name="details" rows="7" cols="60" title="<?php echo html_get_tooltip_description('comment') ?>"></textarea></p>
- <h2><?php echo _('Followup') ?>:</h2>
- <?php
- echo $ah->showMessages();
+ <h2><?php echo _('Followups: ') ;
+ if ($sort_comments_chronologically) {
+ echo '<a href="' .
+ util_make_url('/tracker/index.php?func=detail&aid=' . $aid . '&group_id=' . $group_id . '&atid=' . $ath->getID() . '&commentsort=anti') .
+ '">' . _('Sort comments antichronologically') . '</a>';
+ } else {
+ echo '<a href="' .
+ util_make_url('/tracker/index.php?func=detail&aid=' . $aid . '&group_id=' . $group_id . '&atid=' . $ath->getID() . '&commentsort=chrono') .
+ '">' . _('Sort comments chronologically') . '</a>';
+ }
+echo '</h2>';
+echo $ah->showMessages($sort_comments_chronologically);
?>
</td></tr>
</table>
More information about the evolvis-commits
mailing list