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 cce47c31aef2baa6236f9a03e4ca40f3b5d0a097 (commit)
via f338cb72850554f3cc8eed02ae76f1882b8e7ad6 (commit)
from 8494eeabdddc5e8f701e028fe910e29357958ade (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=cce47c31aef2baa6236f9a03e4ca40f3b5d0a097
commit cce47c31aef2baa6236f9a03e4ca40f3b5d0a097
Author: Franck Villaume <[email protected]>
Date: Sun Dec 17 20:15:59 2017 +0100
Installation: add missing ImageMagick dependencies
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 0498dd9..ec4fa1e 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -82,7 +82,7 @@ else
cvs subversion viewvc python-pycurl git gitweb mercurial xinetd
\
moin mod_wsgi python-psycopg2 \
unoconv poppler-utils libreoffice-headless \
- mediawiki php-markdown \
+ mediawiki ImageMagick php-markdown \
vsftpd \
dejavu-fonts-common
fi
diff --git a/src/rpm/plugins b/src/rpm/plugins
index 4d1f70d..496af05 100644
--- a/src/rpm/plugins
+++ b/src/rpm/plugins
@@ -53,7 +53,7 @@ Requires:
Requires:
%package plugin-mediawiki
-Requires: mediawiki
+Requires: mediawiki ImageMagick
%package plugin-message
Requires:
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f338cb72850554f3cc8eed02ae76f1882b8e7ad6
commit f338cb72850554f3cc8eed02ae76f1882b8e7ad6
Author: Franck Villaume <[email protected]>
Date: Sun Dec 17 20:15:30 2017 +0100
Tracker Release Custom Field: ensure we get FRS package factory
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 0c330ca..e00d401 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -851,20 +851,25 @@ class ArtifactTypeHtml extends ArtifactType {
}
$fpFactory = new FRSPackageFactory($this->getGroup());
- $packages = $fpFactory->getFRSs(true);
- uasort($packages, 'compareObjectName');
- foreach ($packages as $package) {
- $releases = $package->getReleases(false);
- uasort($releases, 'compareObjectName');
- foreach ($releases as $release) {
- $optGroup[] = $package->getName();
- $releasesArray[$release->getID()] =
$release->getName();
+ if ($fpFactory && is_object($fpFactory) &&
!$fpFactory->isError()) {
+ $packages = $fpFactory->getFRSs(true);
+ uasort($packages, 'compareObjectName');
+ foreach ($packages as $package) {
+ $releases = $package->getReleases(false);
+ uasort($releases, 'compareObjectName');
+ foreach ($releases as $release) {
+ $optGroup[] = $package->getName();
+ $releasesArray[$release->getID()] =
$release->getName();
+ }
}
- }
- $keys = array_keys($releasesArray);
- $vals = array_values($releasesArray);
- return html_build_select_box_from_arrays($keys, $vals,
'extra_fields['.$extra_field_id.']', $checked, $show_100, $text_100, $show_any,
$text_any, $allowed, $attrs, $releasesAttrs, array(), $optGroup);
+ $keys = array_keys($releasesArray);
+ $vals = array_values($releasesArray);
+ return html_build_select_box_from_arrays($keys, $vals,
'extra_fields['.$extra_field_id.']', $checked, $show_100, $text_100, $show_any,
$text_any, $allowed, $attrs, $releasesAttrs, array(), $optGroup);
+ } else {
+ global $HTML;
+ return $HTML->error_msg(_('Unable to get FRS Package
Factory'));
+ }
}
/**
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 2 +-
.../tracker/include/ArtifactTypeHtml.class.php | 29 +++++++++++++---------
src/rpm/plugins | 2 +-
3 files changed, 19 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
