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  1ac6ec0999e7e42314691259db23bd456bc8d290 (commit)
       via  d2f2c93d50b0919c4a4aa1bce0ca9b2274e2bd96 (commit)
      from  e7d585a1a22fc4e30352f98278482a1e63e7a4ab (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=1ac6ec0999e7e42314691259db23bd456bc8d290

commit 1ac6ec0999e7e42314691259db23bd456bc8d290
Author: Franck Villaume <[email protected]>
Date:   Sun Oct 15 16:15:59 2017 +0200

    final fix on populate_template_project.php tool

diff --git a/src/bin/populate_template_project.php 
b/src/bin/populate_template_project.php
index 31603d8..81d337d 100755
--- a/src/bin/populate_template_project.php
+++ b/src/bin/populate_template_project.php
@@ -23,22 +23,18 @@
 
 require (dirname(__FILE__).'/../www/env.inc.php');
 require_once $gfcommon.'include/pre.php';
+require_once $gfcommon.'include/Plugin.class.php';
+require_once $gfcommon.'include/PluginManager.class.php';
 
-$err = '';
-
-// Plugins subsystem
-require_once 'common/include/Plugin.class.php';
-require_once 'common/include/PluginManager.class.php';
-
-setup_plugin_manager ();
-session_set_admin ();
+setup_plugin_manager();
+session_set_admin();
 
 function usage($rc = 1) {
-       echo "Usage:\n";
+       echo _('Usage')._(':')."\n";
        echo "\t.../populate_template_project.php 5\n";
        echo "\t.../populate_template_project.php new unixname groupname\n";
-       echo "The first syntax populates an existing group, with its ID 
given.\n";
-       echo "The second syntax creates a new template group.\n";
+       echo _('The first syntax populates an existing group, with its ID 
given.')."\n";
+       echo _('The second syntax creates a new template group.')."\n";
        exit($rc);
 }
 
@@ -100,22 +96,22 @@ function populateProject($project) {
 
        if (forge_get_config('use_forum')) {
                $f1 = new Forum($project);
-               if (!$f1->create(_('Open-Discussion'),_('General 
Discussion'),1,'',1,0)) {
-                       $project->setError(sprintf (_('F%d: %s'), 1, 
$f1->getErrorMessage()));
+               if (!$f1->create(_('Open-Discussion'),_('General 
Discussion'),'',1)) {
+                       $project->setError(sprintf(_('F%d: %s'), 1, 
$f1->getErrorMessage()));
                        db_rollback();
                        setup_gettext_from_context();
                        return false;
                }
                $f2 = new Forum($project);
-               if (!$f2->create(_('Help'),_('Get Public Help'),1,'',1,0)) {
-                       $project->setError(sprintf (_('F%d: %s'), 2, 
$f2->getErrorMessage()));
+               if (!$f2->create(_('Help'),_('Get Public Help'),'',1)) {
+                       $project->setError(sprintf(_('F%d: %s'), 2, 
$f2->getErrorMessage()));
                        db_rollback();
                        setup_gettext_from_context();
                        return false;
                }
                $f3 = new Forum($project);
-               if (!$f3->create(_('Developers-Discussion'),_('Project 
Developer Discussion'),0,'',1,0)) {
-                       $project->setError(sprintf (_('F%d: %s'), 3, 
$f3->getErrorMessage()));
+               if (!$f3->create(_('Developers-Discussion'),_('Project 
Developer Discussion'),'',1)) {
+                       $project->setError(sprintf(_('F%d: %s'), 3, 
$f3->getErrorMessage()));
                        db_rollback();
                        setup_gettext_from_context();
                        return false;
@@ -144,14 +140,14 @@ function populateProject($project) {
 
        if (forge_get_config('use_pm')) {
                $pg = new ProjectGroup($project);
-               if (!$pg->create(_('To Do'),_('Things We Have To Do'),1)) {
+               if (!$pg->create(_('To Do'),_('Things We Have To Do'))) {
                        $project->setError(sprintf(_('PG%d: %s'), 1, 
$pg->getErrorMessage()));
                        db_rollback();
                        setup_gettext_from_context();
                        return false;
                }
                $pg = new ProjectGroup($project);
-               if (!$pg->create(_('Next Release'),_('Items For Our Next 
Release'),1)) {
+               if (!$pg->create(_('Next Release'),_('Items For Our Next 
Release'))) {
                        $project->setError(sprintf(_('PG%d: %s'), 2, 
$pg->getErrorMessage()));
                        db_rollback();
                        setup_gettext_from_context();
@@ -179,22 +175,16 @@ function populateProject($project) {
        $ra->setSetting('forum', $f2->getID(), 3);
        $rl->setSetting('forum', $f2->getID(), 3);
 
-       $pgf = new ProjectGroupFactory ($project);
+       $pgf = new ProjectGroupFactory($project);
        foreach ($pgf->getAllProjectGroupIds() as $pgid) {
-               $pg = projectgroup_get_object($pgid);
-               if ($pg->isPublic()) {
-                       $ra->setSetting('pm', $pgid, 1);
-                       $rl->setSetting('pm', $pgid, 1);
-               }
+               $ra->setSetting('pm', $pgid, 1);
+               $rl->setSetting('pm', $pgid, 1);
        }
 
-       $atf = new ArtifactTypeFactory ($project);
+       $atf = new ArtifactTypeFactory($project);
        foreach ($atf->getAllArtifactTypeIds() as $atid) {
-               $at = artifactType_get_object ($atid);
-               if ($at->isPublic()) {
-                       $ra->setSetting('tracker', $atid, 1);
-                       $rl->setSetting('tracker', $atid, 1);
-               }
+               $ra->setSetting('tracker', $atid, 1);
+               $rl->setSetting('tracker', $atid, 1);
        }
 
        if (forge_get_config('use_mail')) {
@@ -207,10 +197,9 @@ function populateProject($project) {
                        return false;
                }
        }
-       $project->normalizeAllRoles();
 
+       $project->normalizeAllRoles();
        db_commit();
-
        return true;
 }
 

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d2f2c93d50b0919c4a4aa1bce0ca9b2274e2bd96

commit d2f2c93d50b0919c4a4aa1bce0ca9b2274e2bd96
Author: Franck Villaume <[email protected]>
Date:   Sun Oct 15 16:15:35 2017 +0200

    space

diff --git a/src/common/pm/ProjectGroup.class.php 
b/src/common/pm/ProjectGroup.class.php
index 8a6c997..268816b 100644
--- a/src/common/pm/ProjectGroup.class.php
+++ b/src/common/pm/ProjectGroup.class.php
@@ -134,7 +134,7 @@ class ProjectGroup extends FFError {
         * @param       string  $send_all_posts_to      The email address to 
send new notifications to.
         * @return      bool    success.
         */
-       function create($project_name,$description,$send_all_posts_to='') {
+       function create($project_name, $description, $send_all_posts_to = '') {
                if (strlen($project_name) < 3) {
                        $this->setError(sprintf(_('Title Must Be At Least %d 
Characters'), 3));
                        return false;

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

Summary of changes:
 src/bin/populate_template_project.php | 55 ++++++++++++++---------------------
 src/common/pm/ProjectGroup.class.php  |  2 +-
 2 files changed, 23 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to