[aur-dev] [PATCH 3/4] pkgbase.php: Highlight error messages

Lukas Fleischer archlinux at cryptocrack.de
Wed Jul 2 02:29:36 EDT 2014


Make sure that error messages above the package list are actually
visible to the user.

Signed-off-by: Lukas Fleischer <archlinux at cryptocrack.de>
---
 web/html/pkgbase.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php
index c246b6f..5e27e4e 100644
--- a/web/html/pkgbase.php
+++ b/web/html/pkgbase.php
@@ -79,14 +79,15 @@ if (check_token()) {
 				if ($merge_base_id) {
 					list($ret, $output) = pkgbase_delete($atype, $ids, $merge_base_id, $via);
 					unset($_GET['ID']);
-				}
-				else {
+				} else {
 					$output = __("Cannot find package to merge votes and comments into.");
+					$ret = false;
 				}
 			}
 		}
 		else {
 			$output = __("The selected packages have not been deleted, check the confirmation checkbox.");
+			$ret = false;
 		}
 	} elseif (current_action("do_Notify")) {
 		list($ret, $output) = pkgbase_notify($atype, $ids);
@@ -145,7 +146,11 @@ html_header($title, $details);
 ?>
 
 <?php if ($output): ?>
+<?php if ($ret): ?>
 <p class="pkgoutput"><?= $output ?></p>
+<?php else: ?>
+<ul class="errorlist"><li><?= $output ?></li></ul>
+<?php endif; ?>
 <?php endif; ?>
 
 <?php
-- 
2.0.1



More information about the aur-dev mailing list