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, 6.1 has been updated
via 116e884f2daae0e02fadc38512383289b4fc1631 (commit)
from 7ad3fe97d8ef2db57d3cef77001fc45936a1491a (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=116e884f2daae0e02fadc38512383289b4fc1631
commit 116e884f2daae0e02fadc38512383289b4fc1631
Author: Franck Villaume <[email protected]>
Date: Fri Jan 12 17:56:31 2018 +0100
project admin: turn off trove according to forge configuration
diff --git a/src/www/project/admin/group_trove.php
b/src/www/project/admin/group_trove.php
index 07b922b..8422146 100644
--- a/src/www/project/admin/group_trove.php
+++ b/src/www/project/admin/group_trove.php
@@ -6,7 +6,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2002-2004 (c) GForge Team
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016,2018, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -35,6 +35,10 @@ global $use_tooltips, $HTML;
$group_id = getIntFromRequest('group_id');
session_require_perm('project_admin', $group_id);
+if (!forge_get_config('use_trove')) {
+ exit_disabled('summary');
+}
+
// Check for submission. If so, make changes and redirect
if (getStringFromRequest('submit') && getStringFromRequest('root1')) {
diff --git a/src/www/project/admin/index.php b/src/www/project/admin/index.php
index 5686b61..860745c 100644
--- a/src/www/project/admin/index.php
+++ b/src/www/project/admin/index.php
@@ -150,14 +150,14 @@ if (forge_get_config('use_shell')) {
<?php if (forge_get_config('use_project_tags')) { ?>
<h2><?php echo _('Project tags'); ?></h2>
<p>
-<?php echo _('Add tags (use comma as separator): ') ?><br />
+<?php echo _('Add tags (use comma as separator)')._(':') ?><br />
<input type="text" name="form_tags" size="100" value="<?php echo
$group->getTags(); ?>" />
</p>
<?php
$infos = getAllProjectTags();
if ($infos) {
echo '<br />';
- echo _('Or pick a tag from those used by other projects: ');
+ echo _('Or pick a tag from those used by other
projects')._(':');
echo '<br />';
$titleArr = array(_('Tags'), _('Projects'));
echo $HTML->listTableTop($titleArr);
@@ -186,14 +186,13 @@ if (forge_get_config('use_shell')) {
}
echo $HTML->listTableBottom();
}
-} ?>
+}
-<h2><?php echo _('Trove Categorization'); ?></h2>
-<p>
-<?php
-echo
util_make_link('/project/admin/group_trove.php?group_id='.$group->getID(),
'['._('Edit Trove').']');
+if (forge_get_config('use_trove')) {
+ echo html_e('h2', array(), _('Trove Categorization'));
+ echo html_e('p', array(),
util_make_link('/project/admin/group_trove.php?group_id='.$group->getID(),
'['._('Edit Trove').']'));
+}
?>
-</p>
<h2><?php echo _('Homepage Link') ?></h2>
<p>
-----------------------------------------------------------------------
Summary of changes:
src/www/project/admin/group_trove.php | 6 +++++-
src/www/project/admin/index.php | 15 +++++++--------
2 files changed, 12 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
