From: <sy...@us...> - 2007-07-10 11:06:03
|
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5633 Modified Files: tiki-admin_trackers.php Log Message: Instant-Auto-Merge from BRANCH-1-9 to HEAD Index: tiki-admin_trackers.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_trackers.php,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- tiki-admin_trackers.php 16 Jun 2007 16:01:44 -0000 1.57 +++ tiki-admin_trackers.php 10 Jul 2007 11:06:01 -0000 1.58 @@ -70,6 +70,13 @@ } else { $tracker_options["showCreated"] = 'n'; } + if (isset($_REQUEST["showCreatedView"]) + && ($_REQUEST["showCreatedView"] == 'on' + or $_REQUEST["showCreatedView"] == 'y')) { + $tracker_options["showCreatedView"] = 'y'; + } else { + $tracker_options["showCreatedView"] = 'n'; + } if (isset($_REQUEST["showStatus"]) && ($_REQUEST["showStatus"] == 'on' @@ -172,6 +179,13 @@ } else { $tracker_options["showLastModif"] = 'n'; } + if (isset($_REQUEST["showLastModifView"]) + && ($_REQUEST["showLastModifView"] == 'on' + or $_REQUEST["showLastModifView"] == 'y')) { + $tracker_options["showLastModifView"] = 'y'; + } else { + $tracker_options["showLastModifView"] = 'n'; + } if (isset($_REQUEST["defaultOrderDir"]) @@ -329,6 +343,7 @@ $info["name"] = ''; $info["description"] = ''; $info["showCreated"] = ''; +$info["showCreatedView"] = ''; $info["useExplicitNames"] = ''; $info['doNotShowEmptyField'] = ''; $info['showPopup'] = ''; @@ -338,6 +353,7 @@ $info["outboundEmail"] = ''; $info["newItemStatus"] = ''; $info["showLastModif"] = ''; +$info["showLastModifView"] = ''; $info["useRatings"] = ''; $info["ratingOptions"] = ''; $info["showRatings"] = ''; @@ -374,6 +390,7 @@ $smarty->assign('name', $info["name"]); $smarty->assign('description', $info["description"]); $smarty->assign('showCreated', $info["showCreated"]); +$smarty->assign('showCreatedView', $info["showCreatedView"]); $smarty->assign('useExplicitNames', $info["useExplicitNames"]); $smarty->assign('doNotShowEmptyField', $info['doNotShowEmptyField']); $smarty->assign('showPopup', $info['showPopup']); @@ -383,6 +400,7 @@ $smarty->assign('outboundEmail', $info["outboundEmail"]); $smarty->assign('newItemStatus', $info["newItemStatus"]); $smarty->assign('showLastModif', $info["showLastModif"]); +$smarty->assign('showLastModifView', $info["showLastModifView"]); $smarty->assign('useRatings', $info["useRatings"]); $smarty->assign('ratingOptions', $info["ratingOptions"]); $smarty->assign('showRatings', $info["showRatings"]); |