cvs: pearweb /public_html/notes/admin trans.php /templates/notes note-manage-admin.tpl.php

wiesemann Fri May 11 21:51:30 2007 UTC

Modified files:
/pearweb/templates/notes note-manage-admin.tpl.php
/pearweb/public_html/notes/admin trans.php
Log:
- another fix for bug #11016:
"delete" button makes no sense on the "undelete" page
- more fixes for trans.php redirecting (now works like one would expect it)

http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/templates/notes/note-manage-admin.tpl.php
diff -u pearweb/templates/notes/note-manage-admin.tpl.php:1.25 pearweb/templates/notes/note-manage-admin.tpl.php:1.26
--- pearweb/templates/notes/note-manage-admin.tpl.php:1.25 Fri May 11 20:54:15 2007
+++ pearweb/templates/notes/note-manage-admin.tpl.php Fri May 11 21:51:30 2007
@@ -92,12 +92,14 @@
<input type="submit" name="<?php echo $name ?>" value="<?php echo $button ?>" />
</td>
</tr>
+ <?php if ($name != 'undelete'): ?>
<tr>
<th class="form-label_left">Delete Notes</th>
<td class="form-input" colspan="4">
<div align="right"><input type="submit" name="delete" value="Delete" /></div>
</td>
</tr>
+ <?php endif; ?>
</table>
</form>
<?php response_footer(); ?>
http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/public_html/notes/admin/trans.php
diff -u pearweb/public_html/notes/admin/trans.php:1.11 pearweb/public_html/notes/admin/trans.php:1.12
--- pearweb/public_html/notes/admin/trans.php:1.11 Fri May 11 21:13:11 2007
+++ pearweb/public_html/notes/admin/trans.php Fri May 11 21:51:30 2007
@@ -106,6 +106,7 @@
$message .= isset($_POST['pending']) ? 'made pending' : 'deleted';
}
$_GET = $_POST;
+ $_GET['status'] = 'approved';

include dirname(__FILE__) . '/index.php';
exit;
@@ -146,13 +147,18 @@
$message .= isset($_POST['approve']) ? 'approved' : 'deleted';
}
$_GET = $_POST;
+ if (isset($_POST['undelete'])) {
+ $_GET['status'] = 'deleted';
+ }

include dirname(__FILE__) . '/index.php';
exit;
} else {
$error = 'Neither delete nor approve was selected';
$_GET = $_POST;
- if (isset($_POST['delete'])) {
+ if (isset($_POST['approve'])) {
+ $_GET['status'] = 'approved';
+ } elseif (isset($_POST['delete'])) {
$_GET['status'] = 'deleted';
}