rel-eng/packages/spacewalk-web | 2 +-
web/modules/sniglets/Sniglets/Servers.pm | 3 ++-
web/spacewalk-web.spec | 7 ++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 84a6a7c97e0ec49996a75264a75389ee14863135
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 30 11:05:11 2012 +0100
Automatic commit of package [spacewalk-web] release [1.7.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 56ee0bb..05d211b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.7.9-1 web/
+1.7.10-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index a4dc392..3787851 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.7.9
+Version: 1.7.10
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Jan 30 2012 Miroslav Suchý 1.7.10-1
+- In Spacewalk do not test presence of rhn-proxy family, if we want to display
+ list of Proxies
+- The target_systems.pxt was migrated to Java years ago.
+
* Thu Jan 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.9-1
- delete server sets at once
commit 407a6f16b6c43e0c4f48e00abdef83ec07742e3e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 30 11:04:02 2012 +0100
In Spacewalk do not test presence of rhn-proxy family, if we want to display list of
Proxies
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 3c9f7c7..548d3e2 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -23,6 +23,7 @@ use File::Spec;
use Data::Dumper;
use Date::Parse;
+use PXT::Config ();
use PXT::Utils;
use PXT::HTML;
@@ -148,7 +149,7 @@ sub proxy_entitlement_form {
my $block = $params{__block__};
throw "User '" . $pxt->user->id . "' attempted to access
proxy interface without permission."
- unless
$pxt->user->org->has_channel_family_entitlement('rhn-proxy');
+ unless ($pxt->user->org->has_channel_family_entitlement('rhn-proxy')
or not PXT::Config->get('subscribe_proxy_channel'));
my $sid = $pxt->param('sid');
throw "no server id!" unless $sid;