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 9c5f29506433df5316c0558d65070e4fdf7781b4 (commit)
from b979c00be83b7a56dc0b5013226fca54ef8ed3de (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=9c5f29506433df5316c0558d65070e4fdf7781b4
commit 9c5f29506433df5316c0558d65070e4fdf7781b4
Author: Franck Villaume <[email protected]>
Date: Thu Dec 26 12:15:33 2019 +0000
implement [#889]: display link to hudson/jenkins plugin in the widget
Public Area
diff --git a/src/CHANGES b/src/CHANGES
index 8b76226..6c21777 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,18 +1,20 @@
FusionForge X.y:
-* Widget HomeLatestDiaryNotes: new widget for Forge home page to display 5
latest public Diary Notes across the forge (TrivialDev)
+* Developer page: use widget system, including general & scmgit widgets [#899]
(TrivialDev)
* Diary & Notes: support markdown (TrivialDev)
* Diary & Notes: support crossref (TrivialDev)
-* Utils: crossref, support diary [Nxxx] and Project [Pxxx] (TrivialDev)
-* Developer page: use widget system, including general & scmgit widgets [#899]
(TrivialDev)
+* Plugin Hudson/Jenkins: display link in public area widget [#889] (TrivialDev)
* User: followers/following mechanism (TrivialDev)
+* Utils: crossref, support diary [Nxxx] and Project [Pxxx] (TrivialDev)
+* Widget HomeLatestDiaryNotes: new widget for Forge home page to display 5
latest public Diary Notes across the forge (TrivialDev)
+* Widget_RSS: upgrade SimplePie integration to 1.3.1 version (align source
install & debian install) [#913] (TrivialDev)
FusionForge 6.1.1:
-* Search Engine: fix PHP notice in SearchManager.class.php [#908] (TrivialDev)
* Plugin Scmhook: fix scmhook commitEmail for scmhg broken [#903] (TrivialDev)
* Plugin Scmhook: fix scmhook commitTracker [#911] (Florian Bruneau)
* Plugin Scmsvn: fix <reponame>_scmsvn_paths.txt support [#906] (TrivialDev)
* Plugin Scmgit: fix wrong host for js, css inclusion [#909] (TrivialDev)
* Project Admin: fix FRS notification settings [#910] (TrivialDev)
+* Search Engine: fix PHP notice in SearchManager.class.php [#908] (TrivialDev)
* Widget User Page: fix owner test to ensure the user is the owner of the
layout.
FusionForge 6.1:
diff --git a/src/plugins/hudson/include/hudsonPlugin.class.php
b/src/plugins/hudson/include/hudsonPlugin.class.php
index 3576cba..2fd434c 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,2016, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016,2019, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -57,6 +57,7 @@ control over it to the project administrator.");
$this->_addHook('role_has_permission');
$this->_addHook('role_get_setting');
$this->_addHook('list_roles_by_permission');
+ $this->_addHook('project_public_area');
}
function CallHook($hookname, &$params) {
@@ -110,6 +111,8 @@ control over it to the project administrator.");
$this->role_get_setting($params);
} elseif ($hookname == 'list_roles_by_permission') {
$this->list_roles_by_permission($params);
+ } elseif ($hookname == 'project_public_area') {
+ $this->project_public_area();
}
}
@@ -416,4 +419,29 @@ control over it to the project administrator.");
}
return true;
}
+
+ function project_public_area(&$params) {
+ if (isset($params['group_id'])) {
+ $group_id=$params['group_id'];
+ } elseif (isset($params['group'])) {
+ $group_id=$params['group'];
+ } else {
+ $group_id=null;
+ }
+
+ $project = group_get_object($group_id);
+ if (!$project || !is_object($project)) {
+ return;
+ }
+ if ($project->isError()) {
+ return;
+ }
+ if ( $project->usesPlugin($this->name)) {
+ $params['result'] .= '<div class="public-area-box">';
+ $params['result'] .=
util_make_link('/plugins/'.$this->name.'/?group_id='.$project->getID(),
+
html_abs_image(util_make_url('/plugins/'.$this->name.'/icon.png'),'20','20',array('alt'=>'Hudson/Jenkins')).
+ '
Hudson/Jenkins');
+ $params['result'] .= '</div>';
+ }
+ }
}
diff --git a/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
b/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
index a97cd1e..8d5194d 100644
--- a/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
+++ b/src/plugins/hudson/include/hudson_Widget_MyMonitoredJobs.class.php
@@ -1,6 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
+ * Copyright 2019, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -80,13 +81,13 @@ class hudson_Widget_MyMonitoredJobs extends
HudsonOverviewWidget {
}
if ($this->_all_status['grey'] > 0 || $this->_all_status['red']
> 0) {
$this->_global_status = _("One or more failure or
pending job");
- $this->_global_status_icon =
$this->plugin->getThemePath() . "/images/ic/" . "status_red.png";
+ $this->_global_status_icon =
$this->plugin->getIconsPath() . "status_red.png";
} elseif ($this->_all_status['yellow'] > 0) {
$this->_global_status = _("One or more unstable job");
- $this->_global_status_icon =
$this->plugin->getThemePath() . "/images/ic/" . "status_yellow.png";
+ $this->_global_status_icon =
$this->plugin->getIconsPath() . "status_yellow.png";
} else {
$this->_global_status = _("Success");
- $this->_global_status_icon =
$this->plugin->getThemePath() . "/images/ic/" . "status_blue.png";
+ $this->_global_status_icon =
$this->plugin->getIconsPath() . "status_blue.png";
}
}
diff --git
a/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
b/src/plugins/hudson/include/hudson_Widget_ProjectJobsOverview.class.php
index b865344..c2c799d 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,2016, Franck Villaume - TrivialDev
+ * Copyright 2014,2016,2019, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -68,13 +68,13 @@ class hudson_Widget_ProjectJobsOverview extends
HudsonOverviewWidget {
}
if ($this->_all_status['grey'] > 0 ||
$this->_all_status['red'] > 0) {
$this->_global_status = _("One or more failure
or pending job");
- $this->_global_status_icon =
'/'.$this->plugin->getThemePath() . "/images/ic/status_red.png";
+ $this->_global_status_icon =
'/'.$this->plugin->getIconsPath() . "status_red.png";
} elseif ($this->_all_status['yellow'] > 0) {
$this->_global_status = _("One or more unstable
job");
- $this->_global_status_icon =
'/'.$this->plugin->getThemePath() . "/images/ic/status_yellow.png";
+ $this->_global_status_icon =
'/'.$this->plugin->getIconsPath() . "status_yellow.png";
} else {
$this->_global_status = _("Success");
- $this->_global_status_icon =
'/'.$this->plugin->getThemePath() . "/images/ic/status_blue.png";
+ $this->_global_status_icon =
'/'.$this->plugin->getIconsPath() . "status_blue.png";
}
} else {
$this->_use_global_status == false;
diff --git a/src/plugins/hudson/www/icon.png b/src/plugins/hudson/www/icon.png
new file mode 100644
index 0000000..0eb450c
Binary files /dev/null and b/src/plugins/hudson/www/icon.png differ
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 10 ++++---
src/plugins/hudson/include/hudsonPlugin.class.php | 30 ++++++++++++++++++++-
.../hudson_Widget_MyMonitoredJobs.class.php | 7 ++---
.../hudson_Widget_ProjectJobsOverview.class.php | 8 +++---
src/plugins/hudson/www/icon.png | Bin 0 -> 29020 bytes
5 files changed, 43 insertions(+), 12 deletions(-)
create mode 100644 src/plugins/hudson/www/icon.png
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
