[Fusionforge-commits] r10855 - in trunk/src/www: project/admin tracker/admin
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Mon Oct 4 19:24:50 CEST 2010
Author: aljeux
Date: 2010-10-04 19:24:50 +0200 (Mon, 04 Oct 2010)
New Revision: 10855
Modified:
trunk/src/www/project/admin/index.php
trunk/src/www/project/admin/users.php
trunk/src/www/tracker/admin/form-workflow.php
trunk/src/www/tracker/admin/ind.php
trunk/src/www/tracker/admin/updates.php
Log:
Better error/feedback messages.
Modified: trunk/src/www/project/admin/index.php
===================================================================
--- trunk/src/www/project/admin/index.php 2010-10-04 17:24:45 UTC (rev 10854)
+++ trunk/src/www/project/admin/index.php 2010-10-04 17:24:50 UTC (rev 10855)
@@ -96,9 +96,9 @@
//100 $logo_image_id
if (!$res) {
- $error_msg = $group->getErrorMessage();
+ $error_msg .= $group->getErrorMessage();
} else {
- $feedback = _('Project information updated');
+ $feedback .= _('Project information updated');
}
}
Modified: trunk/src/www/project/admin/users.php
===================================================================
--- trunk/src/www/project/admin/users.php 2010-10-04 17:24:45 UTC (rev 10854)
+++ trunk/src/www/project/admin/users.php 2010-10-04 17:24:50 UTC (rev 10855)
@@ -146,7 +146,7 @@
if (!$group->updateUser($user_id,$role_id)) {
$error_msg = $group->getErrorMessage();
} else {
- $feedback = _("User Updated Successfully");
+ $feedback = _("Member Updated Successfully");
}
}
} elseif (getStringFromRequest('acceptpending')) {
Modified: trunk/src/www/tracker/admin/form-workflow.php
===================================================================
--- trunk/src/www/tracker/admin/form-workflow.php 2010-10-04 17:24:45 UTC (rev 10854)
+++ trunk/src/www/tracker/admin/form-workflow.php 2010-10-04 17:24:50 UTC (rev 10855)
@@ -33,9 +33,9 @@
} elseif (count($efarr) !== 1) {
// Internal error.
$has_error = true;
- $error_msg .= _('Internal error: Illegal number of status fields (WKFL01).');
+ $error_msg .= _('Internal error: Illegal number of status fields (WKFL01).');
}
-
+
$ath->adminHeader(array ('title'=> _('Configure workflow'),'pagename'=>'tracker_admin_customize_liste','titlevals'=>array($ath->getName())));
/*
Modified: trunk/src/www/tracker/admin/ind.php
===================================================================
--- trunk/src/www/tracker/admin/ind.php 2010-10-04 17:24:45 UTC (rev 10854)
+++ trunk/src/www/tracker/admin/ind.php 2010-10-04 17:24:50 UTC (rev 10855)
@@ -46,7 +46,7 @@
$due_period,$use_resolution,$submit_instructions,$browse_instructions)) {
exit_error($res->getErrorMessage(),'tracker');
} else {
- $feedback = _('Tracker created successfully');
+ $feedback .= _('Tracker created successfully');
$feedback .= '<br/>';
$feedback .= _('Please configure also the roles (by default, it\'s \'No Access\')');
}
Modified: trunk/src/www/tracker/admin/updates.php
===================================================================
--- trunk/src/www/tracker/admin/updates.php 2010-10-04 17:24:45 UTC (rev 10854)
+++ trunk/src/www/tracker/admin/updates.php 2010-10-04 17:24:50 UTC (rev 10855)
@@ -36,9 +36,9 @@
$ab = new ArtifactExtraField($ath);
if (!$ab || !is_object($ab)) {
- $feedback .= _('Unable to create ArtifactExtraField Object');
+ $error_msg .= _('Unable to create ArtifactExtraField Object');
// } elseif ($ab->isError())
-// $feedback .= $ab->getErrorMessage();
+// $error_msg .= $ab->getErrorMessage();
} else {
if (!$ab->create($name,$field_type,$attribute1,$attribute2,$is_required,$alias)) {
$error_msg .= _('Error inserting a custom field').': '.$ab->getErrorMessage();
@@ -92,7 +92,7 @@
if (!$ao || !is_object($ao)) {
$error_msg .= 'Unable to create ArtifactExtraFieldElement Object';
// } elseif ($ao->isError())
-// $feedback .= $ao->getErrorMessage();
+// $error_msg .= $ao->getErrorMessage();
} else {
$name = getStringFromRequest('name');
$status_id = getIntFromRequest('status_id');
@@ -116,7 +116,7 @@
if (!$acr || !is_object($acr)) {
$error_msg .= _('Unable to create ArtifactCanned Object');
// } elseif ($acr->isError()) {
-// $feedback .= $acr->getErrorMessage();
+// $error_msg .= $acr->getErrorMessage();
} else {
if (!$acr->create($title,$body)) {
$error_msg .= _('Error inserting').' : '.$acr->getErrorMessage();
More information about the Fusionforge-commits
mailing list