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 b3ca56cd187550da7cfad1c8dbdfe42abac1ad07 (commit)
via 149e1101e47f0a54acc5ae0d4d9cc6106a456d6c (commit)
via 404014fd0f68c9447ce523f8d182dff4f65b448e (commit)
via 744be6e722d9175cdc76a57bc5a064acd6a7c1c5 (commit)
via 20b7a60745905a7459d4045b2e7bb1b2e2f7737b (commit)
via 94afa194509c5dca4b5f02abfac03b60a0ec2ca2 (commit)
via dd02e62b93ff316f63a36ad8014f3dacdea2d4ae (commit)
from c63be52a3b7e79f65d9b7667d966ea60ec3db0d8 (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=b3ca56cd187550da7cfad1c8dbdfe42abac1ad07
commit b3ca56cd187550da7cfad1c8dbdfe42abac1ad07
Author: Franck Villaume <[email protected]>
Date: Fri Apr 1 19:04:26 2016 +0200
new Widget My Systasks: display systasks on user projects
diff --git a/src/CHANGES b/src/CHANGES
index 70b5a06..92c3345 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -13,6 +13,7 @@ FusionForge 6.X:
* Docman: notify users on document. (TrivialDev)
* Docman: support private directory. (TrivialDev)
* Plugin AuthBuiltin: add captcha after 3 attempts with the same login [#795]
(TrivialDev)
+* Widget MySystasks: new widget for user to display systasks perform on user
projects (TrivialDev)
FusionForge 6.0.4:
* Account Management System: fix sysCreateUser for UNIX: unix_gid dropped
(TrivialDev)
diff --git a/src/common/widget/Widget.class.php
b/src/common/widget/Widget.class.php
index 6a1543e..faf8ee1 100644
--- a/src/common/widget/Widget.class.php
+++ b/src/common/widget/Widget.class.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2012,2014, Franck Villaume - TrivialDev
+ * Copyright 2012,2014,2016 Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -24,23 +24,21 @@ require_once
$gfcommon.'widget/WidgetLayoutManager.class.php';
require_once $gfcommon.'widget/Widget_MySurveys.class.php';
require_once $gfcommon.'widget/Widget_MyProjects.class.php';
require_once $gfcommon.'widget/Widget_MyBookmarks.class.php';
+require_once $gfcommon.'widget/Widget_MyMonitoredDocuments.class.php';
require_once $gfcommon.'widget/Widget_MyMonitoredForums.class.php';
require_once $gfcommon.'widget/Widget_MyMonitoredFp.class.php';
require_once $gfcommon.'widget/Widget_MyLatestCommits.class.php';
require_once $gfcommon.'widget/Widget_MyProjectsLastDocuments.class.php';
require_once $gfcommon.'widget/Widget_MyArtifacts.class.php';
-//require_once('common/widget/Widget_MyBugs.class.php');
//require_once('common/widget/Widget_MySrs.class.php');
require_once $gfcommon.'widget/Widget_MyTasks.class.php';
require_once $gfcommon.'widget/Widget_MyRss.class.php';
-
require_once $gfcommon.'widget/Widget_MyAdmin.class.php';
+require_once $gfcommon.'widget/Widget_MySystasks.class.php';
//require_once 'common/widget/Widget_MyTwitterFollow.class.php';
-//require_once 'common/widget/Widget_MySystemEvent.class.php';
//require_once('common/widget/Widget_MyWikiPage.class.php');
-require_once $gfcommon.'widget/Widget_ProjectDescription.class.php' ;
-//require_once('common/widget/Widget_ProjectClassification.class.php');
+require_once $gfcommon.'widget/Widget_ProjectDescription.class.php' ;
require_once $gfcommon.'widget/Widget_ProjectMembers.class.php';
require_once $gfcommon.'widget/Widget_ProjectInfo.class.php';
require_once $gfcommon.'widget/Widget_ProjectLatestFileReleases.class.php';
@@ -53,7 +51,6 @@ require_once
$gfcommon.'widget/Widget_ProjectLatestCommits.class.php';
//require_once 'common/widget/Widget_ProjectTwitterFollow.class.php';
//require_once('common/widget/Widget_ProjectWikiPage.class.php');
//require_once 'common/widget/Widget_ProjectSvnStats.class.php';
-require_once $gfcommon.'widget/Widget_MyMonitoredDocuments.class.php';
require_once $gfcommon.'widget/Widget_HomeLatestNews.class.php';
require_once $gfcommon.'widget/Widget_HomeStats.class.php';
@@ -61,9 +58,8 @@ require_once $gfcommon.'widget/Widget_HomeTagCloud.class.php';
require_once $gfcommon.'widget/Widget_HomeVersion.class.php';
/**
-* "Codendi" Layout Widget
-*
-*/
+ * FusionForge Layout Widget
+ */
/* abstract */ class Widget {
@@ -231,24 +227,15 @@ require_once
$gfcommon.'widget/Widget_HomeVersion.class.php';
break;
case 'mylatestcommits':
$o = new Widget_MyLatestCommits();
- break;/*
- case 'mybugs':
- $o = new Widget_MyBugs();
break;
+ case 'mysystasks':
+ $o = new Widget_MySystasks();
+ break;/*
case 'mytwitterfollow':
$o = new Widget_MyTwitterFollow();
break;
case 'mywikipage': //not yet
$o = new Widget_MyWikiPage();
- break;
- case 'mysystemevent':
- // This widget is only for super admin
- if (forge_check_global_perm('forge_admin')) {
- $o = new Widget_MySystemEvent();
- }
- break;
- case 'projectclassification':
- $o = new Widget_ProjectClassification();
break;*/
case 'projectdescription':
$o = new Widget_ProjectDescription();
@@ -310,9 +297,8 @@ require_once
$gfcommon.'widget/Widget_HomeVersion.class.php';
switch ($owner_type) {
case WidgetLayoutManager::OWNER_TYPE_USER:
$widgets = array('myadmin', 'mysurveys',
'myprojects', 'mybookmarks',
- 'mymonitoredforums',
'mymonitoredfp', 'myartifacts', 'mybugs', //'mywikipage' //not yet
- 'mytasks', 'mysrs',
'mylatestcommits', 'mytwitterfollow',
- 'mysystemevent', 'myrss',
'mymonitoreddocuments', 'myprojectslastdocuments',
+ 'mymonitoredforums',
'mymonitoredfp', 'myartifacts', 'mysystasks', //'mywikipage' //not yet
+ 'mytasks', 'mylatestcommits',
'myrss', 'mymonitoreddocuments', 'myprojectslastdocuments',
);
break;
case WidgetLayoutManager::OWNER_TYPE_GROUP:
diff --git a/src/common/widget/Widget_MySystasks.class.php
b/src/common/widget/Widget_MySystasks.class.php
new file mode 100644
index 0000000..fce6919
--- /dev/null
+++ b/src/common/widget/Widget_MySystasks.class.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright 2016, Franck Villaume - TrivialDev
+ * http://fusionforge.org
+ *
+ * This file is a part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FusionForge. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require_once 'Widget.class.php';
+
+/**
+ * Widget_MySystasks
+ */
+
+class Widget_MySystasks extends Widget {
+ function __construct() {
+ $this->Widget('mysystasks');
+ }
+
+ function getTitle() {
+ return _('System Actions Queue (past day) in My Projects');
+ }
+
+ function getContent() {
+ $html_my_systasks = '';
+ global $HTML;
+ $user = session_get_user();
+ $groups = $user->getGroups();
+ $gids = array();
+ foreach($groups as $g)
+ $gids[] = $g->getID();
+ if (empty($gids)) {
+ return $HTML->information(_('Not member of any
project'));
+ }
+
+ $gids = implode(',', $gids);
+ $query = "
+ SELECT systask_id, COALESCE(unix_group_name, '-') AS
unix_group_name,
+ plugin_name, systask_type, systasks.status,
+ EXTRACT(epoch FROM requested) AS requested,
+ EXTRACT(epoch FROM started) AS started,
+ EXTRACT(epoch FROM stopped) AS stopped,
+ EXTRACT(epoch FROM started-requested) AS queued,
+ EXTRACT(epoch FROM stopped-started) AS run
+ FROM systasks LEFT JOIN groups ON (systasks.group_id =
groups.group_id)
+ LEFT JOIN plugins ON (systasks.plugin_id =
plugins.plugin_id)
+ WHERE user_id=$1 or systasks.group_id IN ($gids)
+ AND requested > NOW() - interval '1 day'
+ ORDER BY systask_id";
+ $res = db_query_params($query, array($user->getID()));
+
+ if (db_numrows($res) == 0) {
+ return $HTML->information(_('No systask executed during
last day'));
+ }
+
+ $title_arr = array(
+ _('Task ID'),
+ _('Plugin'),
+ _('SysTask Type'),
+ _('Project Name'),
+ _('Status'),
+ _('Requested'),
+ _('Started'),
+ _('Stopped'),
+ );
+
+ $html_my_systasks = $HTML->listTableTop($title_arr);
+ for ($i=0; $i<db_numrows($res); $i++) {
+ $cells = array();
+ $cells[][] = db_result($res,$i,'systask_id');
+ $plugin_name = db_result($res,$i,'plugin_name');
+ if ($plugin_name == null)
+ $cells[][] = 'core';
+ else
+ $cells[][] = $plugin_name;
+ $cells[][] = db_result($res,$i,'systask_type');
+ $cells[][] = db_result($res,$i,'unix_group_name');
+ $cells[][] = db_result($res,$i,'status');
+ $cells[][] = date("H:i:s", db_result($res,
$i,'requested'));
+ $cells[][] = date("H:i:s", db_result($res,
$i,'started'))
+ . ' (+' . round(db_result($res, $i,'queued'),
1) . 's)';
+ $cells[][] = date("H:i:s", db_result($res,
$i,'stopped'))
+ . ' (+' . round(db_result($res, $i,'run'), 1) .
's)';
+ $html_my_systasks .= $HTML->multiTableRow(array('class'
=> $HTML->boxGetAltRowStyle($i+1, true)), $cells);
+ }
+
+ $html_my_systasks .= $HTML->listTableBottom();
+ return $html_my_systasks;
+ }
+
+ function getDescription() {
+ return _('List actions performed by Systask system on all your
projects during the last day.');
+ }
+}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=149e1101e47f0a54acc5ae0d4d9cc6106a456d6c
commit 149e1101e47f0a54acc5ae0d4d9cc6106a456d6c
Author: Franck Villaume <[email protected]>
Date: Fri Apr 1 18:42:57 2016 +0200
coding style
diff --git a/src/common/widget/Widget_MyTasks.class.php
b/src/common/widget/Widget_MyTasks.class.php
index 0ef0dd7..02be83e 100644
--- a/src/common/widget/Widget_MyTasks.class.php
+++ b/src/common/widget/Widget_MyTasks.class.php
@@ -123,12 +123,15 @@ class Widget_MyTasks extends Widget {
$this->content .= $HTML->warning_msg(_('No task yet'));
}
}
+
function getTitle() {
return _('My Tasks');
}
+
function getContent() {
return $this->content;
}
+
function isAvailable() {
if (!forge_get_config('use_pm')) {
return false ;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=404014fd0f68c9447ce523f8d182dff4f65b448e
commit 404014fd0f68c9447ce523f8d182dff4f65b448e
Author: Franck Villaume <[email protected]>
Date: Fri Apr 1 18:41:20 2016 +0200
widget MyTasks: set category to Project Management
diff --git a/src/common/widget/Widget_MyTasks.class.php
b/src/common/widget/Widget_MyTasks.class.php
index 81c7718..0ef0dd7 100644
--- a/src/common/widget/Widget_MyTasks.class.php
+++ b/src/common/widget/Widget_MyTasks.class.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2014-2015, Franck Villaume - TrivialDev
+ * Copyright 2014-2016, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -145,4 +145,8 @@ class Widget_MyTasks extends Widget {
function getDescription() {
return _('List the tasks assigned to you.');
}
+
+ function getCategory() {
+ return _('Project Management');
+ }
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=744be6e722d9175cdc76a57bc5a064acd6a7c1c5
commit 744be6e722d9175cdc76a57bc5a064acd6a7c1c5
Author: Franck Villaume <[email protected]>
Date: Fri Apr 1 18:37:47 2016 +0200
coding style
diff --git a/src/common/widget/Widget_MyMonitoredFp.class.php
b/src/common/widget/Widget_MyMonitoredFp.class.php
index c1ad3c4..ee8a853 100644
--- a/src/common/widget/Widget_MyMonitoredFp.class.php
+++ b/src/common/widget/Widget_MyMonitoredFp.class.php
@@ -122,11 +122,13 @@ class Widget_MyMonitoredFp extends Widget {
function getCategory() {
return _('File Release System');
}
+
function getDescription() {
return _('List packages that you are currently monitoring, by
project.')
. '<br />'
. _('To cancel any of the monitored items just click on the
trash icon next to the item label.');
}
+
function isAjax() {
return true;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=20b7a60745905a7459d4045b2e7bb1b2e2f7737b
commit 20b7a60745905a7459d4045b2e7bb1b2e2f7737b
Author: Franck Villaume <[email protected]>
Date: Fri Apr 1 18:23:28 2016 +0200
hudson/jenkins plugin: use true not "true" in test
diff --git
a/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
b/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
index 6f23ab2..7fd561b 100644
--- a/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
+++ b/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014,2016, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -42,7 +42,7 @@ class hudson_Widget_ProjectJobsOverview extends
HudsonOverviewWidget {
$request =& HTTPRequest::instance();
$this->group_id = $request->get('group_id');
- if ($this->_use_global_status == "true") {
+ if ($this->_use_global_status === true) {
$this->_all_status = array(
'grey' => 0,
'blue' => 0,
@@ -53,7 +53,7 @@ class hudson_Widget_ProjectJobsOverview extends
HudsonOverviewWidget {
}
if (forge_check_perm('hudson', $this->group_id, 'read')) {
$this->content['title'] = '';
- if ($this->_use_global_status == "true") {
+ if ($this->_use_global_status === true) {
$this->content['title'] = '<img
src="'.$this->_global_status_icon.'" title="'.$this->_global_status.'"
alt="'.$this->_global_status.'" /> ';
}
$this->content['title'] .= _("Hudson Jobs");
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=94afa194509c5dca4b5f02abfac03b60a0ec2ca2
commit 94afa194509c5dca4b5f02abfac03b60a0ec2ca2
Author: Franck Villaume <[email protected]>
Date: Fri Apr 1 18:22:39 2016 +0200
hudson/jenkins plugin: fix pie graph, remove unwanted quote
diff --git a/src/plugins/hudson/include/HudsonTestResult.class.php
b/src/plugins/hudson/include/HudsonTestResult.class.php
index 486325c..4781be2 100644
--- a/src/plugins/hudson/include/HudsonTestResult.class.php
+++ b/src/plugins/hudson/include/HudsonTestResult.class.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -123,7 +123,7 @@ class HudsonTestResult {
echo '<script type="text/javascript">//<![CDATA['."\n";
echo 'var data'.$chartid.' = new Array();';
for ($i = 0; $i < count($pie_vals); $i++) {
- echo
'data'.$chartid.'.push([\''.htmlentities($pie_labels[$i]).'\',\''.$pie_vals[$i].'\']);';
+ echo
'data'.$chartid.'.push([\''.htmlentities($pie_labels[$i]).'\','.$pie_vals[$i].']);';
}
echo 'var plot'.$chartid.';';
echo 'jQuery(document).ready(function(){
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=dd02e62b93ff316f63a36ad8014f3dacdea2d4ae
commit dd02e62b93ff316f63a36ad8014f3dacdea2d4ae
Author: Franck Villaume <[email protected]>
Date: Fri Apr 1 18:19:51 2016 +0200
hudson/jenkins plugin: remove useless code + use hudson/jenkins label
diff --git a/src/plugins/hudson/include/hudsonPlugin.class.php
b/src/plugins/hudson/include/hudsonPlugin.class.php
index 69def0e..7cc396a 100644
--- a/src/plugins/hudson/include/hudsonPlugin.class.php
+++ b/src/plugins/hudson/include/hudsonPlugin.class.php
@@ -5,7 +5,7 @@
* Copyright (c) Xerox Corporation, Codendi 2007-2008.
* @author Marc Nazarian <[email protected]>
* Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -32,8 +32,8 @@ class hudsonPlugin extends Plugin {
$this->name = "hudson";
$this->text = _('Hudson/Jenkins'); // To show in the tabs,
use...
$this->pkg_desc =
-_("This plugin contains the Hudson subsystem of FusionForge. It allows each
-FusionForge project to have its own Hudson, and gives some
+_("This plugin contains the Hudson/Jenkins subsystem of FusionForge. It allows
each
+FusionForge project to have its own Hudson/Jenkins, and gives some
control over it to the project administrator.");
$this->_addHook("user_personal_links"); //to make a link to the
user's personal part of the plugin
//$this->_addHook("usermenu") ;
@@ -89,9 +89,7 @@ control over it to the project administrator.");
if (isset($params['toptab'])) {
(($params['toptab'] == $this->name) ?
$params['selected']=(count($params['TITLES'])-1) : '' );
}
- } elseif ($hookname =='cssfile') {
-
use_stylesheet('/plugins/hudson/themes/default/css/style.css');
- } elseif ($hookname == "cssfile") {
+ } elseif ($hookname == 'cssfile') {
$this->cssFile($params);
} elseif ($hookname == 'group_delete') {
$this->projectIsDeleted($params);
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/common/widget/Widget.class.php | 36 +++----
src/common/widget/Widget_MyMonitoredFp.class.php | 2 +
src/common/widget/Widget_MySystasks.class.php | 107 +++++++++++++++++++++
src/common/widget/Widget_MyTasks.class.php | 9 +-
.../hudson/include/HudsonTestResult.class.php | 4 +-
src/plugins/hudson/include/hudsonPlugin.class.php | 10 +-
.../hudson_Widget_ProjectJobsOverview.class.php | 6 +-
8 files changed, 138 insertions(+), 37 deletions(-)
create mode 100644 src/common/widget/Widget_MySystasks.class.php
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
