[Fusionforge-commits] FusionForge branch master updated. 6.0.4-952-gbda999a

Franck Villaume nerville at libremir.placard.fr.eu.org
Fri Sep 30 13:05:37 CEST 2016


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  bda999a7e22bb789c7e3790195178b91b7dcb43b (commit)
      from  82cbcefcdb48c1f00068afbfcbc1347b0929a120 (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=bda999a7e22bb789c7e3790195178b91b7dcb43b

commit bda999a7e22bb789c7e3790195178b91b7dcb43b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Sep 30 13:05:19 2016 +0200

    fix edittemplate include: move it to the right place

diff --git a/src/www/tracker/admin/index.php b/src/www/tracker/admin/index.php
index 5edc409..152edc4 100644
--- a/src/www/tracker/admin/index.php
+++ b/src/www/tracker/admin/index.php
@@ -5,7 +5,7 @@
  * Copyright 1999-2000 (c) The SourceForge Crew
  * Copyright 2010, FusionForge Team
  * Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
  * Copyright 2016, Stéphane-Eymeric Bredthauer - TrivialDev
  * http://fusionforge.org
  *
@@ -83,10 +83,6 @@ if ($group_id && $atid) {
 		getStringFromRequest('post_changes_alphaorder')) {
 		include $gfcommon.'tracker/actions/admin-updates.php';
 
-	} elseif (getStringFromRequest('edittemplate')) {
-
-		include $gfcommon.'tracker/views/form-edittemplate.php';
-
 	} elseif (getStringFromRequest('deletetemplate')) {
 
 		$confirm = getStringFromRequest('confirm');
@@ -140,6 +136,10 @@ if ($group_id && $atid) {
 
 		include $gfcommon.'tracker/views/form-customizelist.php';
 
+	}  elseif (getStringFromRequest('edittemplate')) {
+
+		include $gfcommon.'tracker/views/form-edittemplate.php';
+
 	} elseif ($action == 'workflow') {
 
 		include $gfcommon.'tracker/views/form-workflow.php';

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

Summary of changes:
 src/www/tracker/admin/index.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list