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 b3644fe17632dbfa1383d6e809a49fb6b3f5197b (commit)
from 42bd93c9575ba10dabed9a42cf3c827f79aaf68e (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b3644fe17632dbfa1383d6e809a49fb6b3f5197b
commit b3644fe17632dbfa1383d6e809a49fb6b3f5197b
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Mar 24 18:16:39 2017 +0100
Disallow renaming a category with an empty name
diff --git a/src/www/pm/admin/index.php b/src/www/pm/admin/index.php
index 956738b..82337d6 100644
--- a/src/www/pm/admin/index.php
+++ b/src/www/pm/admin/index.php
@@ -66,13 +66,10 @@ if (getStringFromRequest('post_changes')) {
}
if (getStringFromRequest('addproject')) {
+ /* Add new subproject */
$project_name = getStringFromRequest('project_name');
$description = getStringFromRequest('description');
$send_all_posts_to = getStringFromRequest('send_all_posts_to');
-
- /*
- Add new subproject
- */
session_require_perm ('pm_admin', $group_id) ;
if
(!$pg->create($project_name,$description,$send_all_posts_to)) {
exit_error($pg->getErrorMessage(),'pm');
@@ -83,10 +80,8 @@ if (getStringFromRequest('post_changes')) {
}
} elseif ($add_cat) {
+ /* Add a project_category */
$name = getStringFromRequest('name');
- /*
- Add a project_category
- */
session_require_perm ('pm', $pg->getID(), 'manager') ;
if (trim($name) == '') {
@@ -105,37 +100,36 @@ if (getStringFromRequest('post_changes')) {
}
} elseif ($update_cat) {
- $id = getIntFromRequest('id');
+ /* Update a project_category */
$name = getStringFromRequest('name');
-
- /*
- Update a project_category
- */
- session_require_perm ('pm', $pg->getID(), 'manager') ;
-
- $pc = new ProjectCategory($pg,$id);
- if (!$pc || !is_object($pc)) {
- exit_error(_('Unable to create ProjectCategory
Object'),'pm');
- } elseif ($pc->isError()) {
- exit_error($pc->getErrorMessage(),'pm');
+ if (trim($name) == '') {
+ $error_msg .= _('Name is required');
} else {
- if (!$pc->update($name)) {
- exit_error(_('Update failed')._(':
').$pc->getErrorMessage(),'pm');
+ $id = getIntFromRequest('id');
+ session_require_perm ('pm', $pg->getID(), 'manager') ;
+
+ $pc = new ProjectCategory($pg,$id);
+ if (!$pc || !is_object($pc)) {
+ exit_error(_('Unable to create ProjectCategory
Object'),'pm');
+ } elseif ($pc->isError()) {
+ exit_error($pc->getErrorMessage(),'pm');
} else {
- $feedback .= _('Category Updated');
- $update_cat=false;
- $add_cat=true;
+ if (!$pc->update($name)) {
+ exit_error(_('Update failed')._(':
').$pc->getErrorMessage(),'pm');
+ } else {
+ $feedback .= _('Category Updated');
+ $update_cat=false;
+ $add_cat=true;
+ }
}
}
} elseif (getStringFromRequest('update_pg')) {
+ /* Update a subproject */
$project_name = getStringFromRequest('project_name');
$description = getStringFromRequest('description');
$send_all_posts_to = getStringFromRequest('send_all_posts_to');
- /*
- Update a subproject
- */
session_require_perm ('pm', $pg->getID(), 'manager') ;
if
(!$pg->update($project_name,$description,$send_all_posts_to)) {
@@ -145,12 +139,10 @@ if (getStringFromRequest('post_changes')) {
}
} elseif ($delete) {
+ /* Delete a subproject */
$sure = getStringFromRequest('sure');
$really_sure = getStringFromRequest('really_sure');
- /*
- Delete a subproject
- */
session_require_perm ('pm', $pg->getID(), 'manager') ;
if
(!$pg->delete(getStringFromRequest('sure'),getStringFromRequest('really_sure')))
{
-----------------------------------------------------------------------
Summary of changes:
src/www/pm/admin/index.php | 52 ++++++++++++++++++++--------------------------
1 file changed, 22 insertions(+), 30 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
