[Fusionforge-commits] FusionForge branch master updated. ec8e067a46b0f8b9cc0bf3b68c533736f999aac5

Franck VILLAUME nerville at fusionforge.org
Sat Dec 21 17:36:07 CET 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  ec8e067a46b0f8b9cc0bf3b68c533736f999aac5 (commit)
      from  7af80cc70f46253a4bbed9c771b304e7d53122d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec8e067a46b0f8b9cc0bf3b68c533736f999aac5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 21 17:35:41 2013 +0100

    global role edit: fix feedback, error message display

diff --git a/src/www/admin/globalroleedit.php b/src/www/admin/globalroleedit.php
index 23d91ad..1c75069 100644
--- a/src/www/admin/globalroleedit.php
+++ b/src/www/admin/globalroleedit.php
@@ -4,6 +4,7 @@
  *
  * Copyright 2010-2011, Roland Mas
  * Copyright (c) 2011 Thorsten Glaser <t.glaser at tarent.de>
+ * Copyright 2013, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -26,8 +27,6 @@ require_once $gfcommon.'include/pre.php';
 require_once $gfwww.'admin/admin_utils.php';
 require_once $gfwww.'include/role_utils.php';
 
-site_admin_header(array('title'=>_('Site Admin')));
-
 $role_id = getIntFromRequest('role_id');
 $data = getStringFromRequest('data');
 
@@ -105,6 +104,8 @@ if (getStringFromRequest('adduser')) {
 			} else {
 				$error_msg .= _("Error while adding user to role") ;
 			}
+		} else {
+			$error_msg .= _('Wrong user name.');
 		}
 	} else {
 		$error_msg .= _("Cannot add user to this type of role") ;
@@ -136,6 +137,8 @@ if (getStringFromRequest('dormusers')) {
 	}
 }
 
+site_admin_header(array('title'=>_('Site Admin')));
+
 if ($role instanceof RoleExplicit) {
 	$users = $role->getUsers () ;
 	if (count ($users) > 0) {

-----------------------------------------------------------------------

Summary of changes:
 src/www/admin/globalroleedit.php |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list