2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/satellite_tools/satsync.py | 38 ++++++++++++-------------------
backend/satellite_tools/sync_handlers.py | 24 ++++---------------
backend/spacewalk-backend.spec | 6 ++++
rel-eng/packages/spacewalk-backend | 2 -
4 files changed, 27 insertions(+), 43 deletions(-)
New commits:
commit 6371113223ff1e9026f0b5ac6de682463208db88
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jan 10 14:49:31 2014 -0500
Automatic commit of package [spacewalk-backend] release [2.1.40-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 68c1014..0bd8c25 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.39
+Version: 2.1.40
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,10 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Fri Jan 10 2014 Stephen Herr <sherr(a)redhat.com> 2.1.40-1
+- 1051658 - fixing sat-sync daylight-savings-related 'NoneType is
+ unsubscriptable' error
+
* Fri Jan 03 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.39-1
- 1043657 - allow 1 character system profile names
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index c987a2a..eb74fb9 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.39-1 backend/
+2.1.40-1 backend/
commit 3143007bf42ca1f063cdb7a949b4a1b0157bd38f
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jan 10 14:48:29 2014 -0500
1051658 - fixing sat-sync daylight-savings-related 'NoneType is unsubscriptable' error
I'm changing the package collection to key off of pid only instead of
pid and timestamp. The timestamp info was completely unnecessary anyway.
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 1d4fcce..119b9b0 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -904,10 +904,9 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
h = rhnSQL.prepare(self._query_compare_packages)
for pid in chunk:
- p_timestamp = package_collection.get_package_timestamp(pid)
- l_timestamp = rhnLib.timestamp(p_timestamp)
- package = package_collection.get_package(pid, p_timestamp)
+ package = package_collection.get_package(pid)
assert package is not None
+ l_timestamp = rhnLib.timestamp(package['last_modified'])
if package['org_id'] is not None:
package['org_id'] = OPTIONS.orgid or DEFAULT_ORG
@@ -1078,8 +1077,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
for pid in pids:
# XXX Catch errors
- timestamp = short_package_collection.get_package_timestamp(pid)
- if not package_collection.has_package(pid, timestamp):
+ if not package_collection.has_package(pid):
# not in the cache
mp.append(pid)
@@ -1169,7 +1167,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# Nothing to see here
continue
missing_sps[channel] = [sp_id for (sp_id, timestamp) in sps
- if not sp_collection.has_package(sp_id, timestamp)]
+ if not sp_collection.has_package(sp_id)]
return missing_sps
_query_compare_source_packages = """
@@ -1188,7 +1186,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
sql_params = ['package_id', 'checksum', 'checksum_type']
h = rhnSQL.prepare(self._query_compare_source_packages)
for pid, timestamp in chunk:
- package = package_collection.get_package(pid, timestamp)
+ package = package_collection.get_package(pid)
assert package is not None
params = {}
@@ -1608,8 +1606,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
uq_packages = {}
for chn, package_ids in self._channel_packages_full.items():
for pid in package_ids:
- timestamp = short_package_collection.get_package_timestamp(pid)
- package = short_package_collection.get_package(pid, timestamp)
+ package = short_package_collection.get_package(pid)
if not package:
continue
assert package is not None
@@ -1646,8 +1643,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
package_collection = sync_handlers.PackageCollection()
batch = []
for pid in chunk:
- timestamp = short_package_collection.get_package_timestamp(pid)
- package = package_collection.get_package(pid, timestamp)
+ package = package_collection.get_package(pid)
if package is None:
# not in the cache
raise Exception(_("Package Not Found in Cache, Clear the Cache to \
@@ -1681,13 +1677,11 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
packages = []
# remove packages which are not in the export (e.g. archs we are not syncing)
for pid in pids:
- try:
- timestamp = sp_coll.get_package_timestamp(pid)
- except KeyError:
+ if not sp_coll.has_package(pid):
# Package not found, go on - may be part of a channel we don't
# sync
continue
- package = sp_coll.get_package(pid, timestamp)
+ package = sp_coll.get_package(pid)
packages.append(package)
@@ -1711,8 +1705,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
if errata_file['file_type'] == 'RPM' and \
errata_file_package is not None:
try:
- timestamp = sp_coll.get_package_timestamp(errata_file_package)
- package = sp_coll.get_package(errata_file_package, timestamp)
+ package = sp_coll.get_package(errata_file_package)
except KeyError:
package = None
errata_file['pkgobj'] = package
@@ -1742,8 +1735,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
#count size of missing packages
for package_id, path in missing_fs_packages:
- timestamp = short_package_collection.get_package_timestamp(package_id)
- package = package_collection.get_package(package_id, timestamp)
+ package = package_collection.get_package(package_id)
total_size = total_size+package['package_size']
queue.put((package_id, path))
@@ -1869,8 +1861,8 @@ class ThreadDownload(threading.Thread):
while not self.queue.empty():
#grabs host from queue
(package_id, path) = self.queue.get()
- timestamp = self.short_package_collection.get_package_timestamp(package_id)
- package = self.package_collection.get_package(package_id, timestamp)
+ package = self.package_collection.get_package(package_id)
+ last_modified = package['last_modified']
checksum_type = package['checksum_type']
checksum = package['checksum']
package_size = package['package_size']
@@ -1886,8 +1878,8 @@ class ThreadDownload(threading.Thread):
package['path'] = path
self.package_collection.add_item(package)
- errcode = self.syncer._verify_file(path, rhnLib.timestamp(timestamp), package_size,
- checksum_type, checksum)
+ errcode = self.syncer._verify_file(path, rhnLib.timestamp(last_modified),
+ package_size, checksum_type, checksum)
if errcode == 0:
# file is already there
# do not count this size to time estimate
diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py
index 4d048c5..a035e26 100644
--- a/backend/satellite_tools/sync_handlers.py
+++ b/backend/satellite_tools/sync_handlers.py
@@ -255,7 +255,6 @@ class ShortPackageCollection:
def __init__(self):
self.__dict__ = self._shared_state
if not self._shared_state.keys():
- self._packages_hash = {}
self._cache = None
self._init_cache()
@@ -264,26 +263,15 @@ class ShortPackageCollection:
def add_item(self, package):
"""Stores a package in the collection"""
- package_id = package['package_id']
- timestamp = package['last_modified']
- last_modified = _to_timestamp(timestamp)
- self._packages_hash[package_id] = last_modified
- self._cache.cache_set(package_id, package, timestamp=last_modified)
+ self._cache.cache_set(package['package_id'], package)
- def get_package_timestamp(self, package_id):
- """Returns the package's timestamp"""
- if not self._packages_hash.has_key(package_id):
- raise KeyError("Package %s could not be found" % package_id)
- return self._packages_hash[package_id]
-
- def get_package(self, package_id, timestamp):
- """Return the package with the specified id and timestamp from the
- collection"""
- return self._cache.cache_get(package_id, timestamp=timestamp)
+ def get_package(self, package_id):
+ """Return the package with the specified id from the collection"""
+ return self._cache.cache_get(package_id)
- def has_package(self, package_id, timestamp):
+ def has_package(self, package_id):
"""Returns true if the package exists in the collection"""
- return self._cache.cache_has_key(package_id, timestamp=timestamp)
+ return self._cache.cache_has_key(package_id)
def reset(self):
"""Reset the collection"""
10 years, 4 months
Changes to 'master-action-chaining'
by Silvio Moioli
New branch 'master-action-chaining' available with the following commits:
commit 9289feeea5d60bff7896cdbfe352f218226f6c6c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 10 15:39:05 2014 +0100
Front-end code for action chain creation/selection added
commit ed4fdc84c86f3bf73a8b588f3e13cab2bad8a112
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 8 18:34:43 2014 +0100
Refactoring: use a fragment for scheduling options on supported operations
10 years, 4 months
Changes to 'refs/tags/spacewalk-java-2.1.113-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.113-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2014-01-10 13:45 +0000
Tagging package [spacewalk-java] version [2.1.113-1] in directory [java/].
Changes since spacewalk-web-2.1.47-1:
Matej Kollar (3):
Eliminate unused private fields
Avoiding instantiating Boolean objects
Protected field in final class makes no sense
Tomas Lestach (2):
fix PxtAuthenticationServiceTest
Automatic commit of package [spacewalk-java] release [2.1.113-1].
---
java/code/src/com/redhat/rhn/common/localization/XmlMessages.java | 4 +-
java/code/src/com/redhat/rhn/common/validator/SchemaParser.java | 2 -
java/code/src/com/redhat/rhn/domain/common/ChecksumFactory.java | 1
java/code/src/com/redhat/rhn/domain/common/LoggingFactory.java | 1
java/code/src/com/redhat/rhn/domain/org/OrgConfig.java | 1
java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupFactory.java | 1
java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java | 1
java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 4 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 8 ++---
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ExtraPackagesListAction.java | 1
java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java | 8 -----
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java | 3 --
java/code/src/com/redhat/rhn/frontend/security/test/AuthenticationServiceAbstractTestCase.java | 3 ++
java/code/src/com/redhat/rhn/frontend/security/test/PxtAuthenticationServiceTest.java | 14 +++-------
java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java | 4 --
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 3 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 3 --
java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java | 9 ------
java/code/src/com/redhat/rhn/manager/system/CrashManager.java | 4 --
java/spacewalk-java.spec | 8 +++++
rel-eng/packages/spacewalk-java | 2 -
22 files changed, 25 insertions(+), 62 deletions(-)
---
10 years, 4 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/security/test/AuthenticationServiceAbstractTestCase.java | 3 ++
java/code/src/com/redhat/rhn/frontend/security/test/PxtAuthenticationServiceTest.java | 14 +++-------
java/spacewalk-java.spec | 8 +++++
rel-eng/packages/spacewalk-java | 2 -
4 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit d8a762afedf9553984de9a98a35c30c5ba2e15d8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 10 14:45:56 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.113-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 83cc44b..7a5286d 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.112
+Version: 2.1.113
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -795,6 +795,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 10 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.113-1
+- fix PxtAuthenticationServiceTest
+- Protected field in final class makes no sense
+- Avoiding instantiating Boolean objects
+- Eliminate unused private fields
+
* Fri Jan 10 2014 Tomas Lestach <tlestach(a)redhat.com> 2.1.112-1
- 1013712 - return server action message within schedule.listInProgressSystems
and schedule.listCompletedSystems API calls
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 601c093..516fee2 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.112-1 java/
+2.1.113-1 java/
commit ed14db4ae1e42bd74c087ac437e41c1dc723902a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 17:28:22 2014 +0100
fix PxtAuthenticationServiceTest
diff --git a/java/code/src/com/redhat/rhn/frontend/security/test/AuthenticationServiceAbstractTestCase.java b/java/code/src/com/redhat/rhn/frontend/security/test/AuthenticationServiceAbstractTestCase.java
index a28da2f..1d1a459 100644
--- a/java/code/src/com/redhat/rhn/frontend/security/test/AuthenticationServiceAbstractTestCase.java
+++ b/java/code/src/com/redhat/rhn/frontend/security/test/AuthenticationServiceAbstractTestCase.java
@@ -128,6 +128,9 @@ public abstract class AuthenticationServiceAbstractTestCase extends MockObjectTe
mockRequest.stubs().method("getMethod")
.will(returnValue(new String("POST")));
+ mockRequest.stubs().method("getSession")
+ .will(returnValue(null));
+
mockRequest.stubs().method("setAttribute");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/security/test/PxtAuthenticationServiceTest.java b/java/code/src/com/redhat/rhn/frontend/security/test/PxtAuthenticationServiceTest.java
index 1f20672..b99a1ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/security/test/PxtAuthenticationServiceTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/security/test/PxtAuthenticationServiceTest.java
@@ -122,16 +122,13 @@ public class PxtAuthenticationServiceTest extends AuthenticationServiceAbstractT
}
private void runRedirectToLoginTest() throws Exception {
- mockRequest.expects(atLeastOnce()).method("getRequestDispatcher").will(
- returnValue(mockDispatcher.proxy()));
-
service.redirectToLogin(getRequest(), getResponse());
}
protected void setUpRedirectToLogin() {
super.setUpRedirectToLogin();
- mockDispatcher.stubs().method("forward").withAnyArguments();
+ mockResponse.stubs().method("sendRedirect").will(returnValue(null));
}
/**
@@ -140,9 +137,8 @@ public class PxtAuthenticationServiceTest extends AuthenticationServiceAbstractT
public final void testRedirectoToLoginForwardsRequest() throws Exception {
setUpRedirectToLogin();
- mockDispatcher.expects(once()).method("forward").with(
- new Constraint[] {eq(getRequest()),
- eq(mockResponse.proxy())});
+ mockResponse.expects(once()).method("sendRedirect").with(
+ new Constraint[] {eq("/rhn/Login.do")}).will(returnValue(null));
mockRequest.stubs().method("getParameterNames").will(
returnValue(new Vector().elements()));
@@ -162,8 +158,8 @@ public class PxtAuthenticationServiceTest extends AuthenticationServiceAbstractT
String redirectUri = createRequestURIWithParams(requestParamNames,
requestParamValues);
- mockRequest.expects(atLeastOnce()).method("setAttribute").with(
- new Constraint[] {eq("url_bounce"), eq(redirectUri)});
+ mockResponse.expects(once()).method("sendRedirect").with(
+ new Constraint[] {eq("/rhn/Login.do")}).will(returnValue(null));
runRedirectToLoginTest();
}
10 years, 4 months
java/code
by mkollar
java/code/src/com/redhat/rhn/common/localization/XmlMessages.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 785becda4f7407d048b7d524736137b4d847e1cf
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Fri Jan 10 14:34:15 2014 +0100
Protected field in final class makes no sense
diff --git a/java/code/src/com/redhat/rhn/common/localization/XmlMessages.java b/java/code/src/com/redhat/rhn/common/localization/XmlMessages.java
index 02da8a6..eb62f65 100644
--- a/java/code/src/com/redhat/rhn/common/localization/XmlMessages.java
+++ b/java/code/src/com/redhat/rhn/common/localization/XmlMessages.java
@@ -52,8 +52,8 @@ public final class XmlMessages {
public static final String MESSAGE_NOT_FOUND = "*** MESSAGE NOT FOUND ***";
/** Set to "StringResource"
- */
- protected static final String RESOURCE_BUNDLE_CLASSNAME = "StringResource";
+ */
+ private static final String RESOURCE_BUNDLE_CLASSNAME = "StringResource";
public static final String PRODUCT_NAME_MACRO = "@@PRODUCT_NAME@@";
10 years, 4 months
java/code
by mkollar
java/code/src/com/redhat/rhn/common/validator/SchemaParser.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit db7b5b4c6c7f6fef57d64dc5072cc8bacbe1dfeb
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Fri Jan 10 14:06:48 2014 +0100
Avoiding instantiating Boolean objects
diff --git a/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java b/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
index 23a3310..5e5cb88 100644
--- a/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
+++ b/java/code/src/com/redhat/rhn/common/validator/SchemaParser.java
@@ -251,7 +251,7 @@ public class SchemaParser {
optional = Boolean.TRUE;
}
else {
- optional = new Boolean(value);
+ optional = Boolean.valueOf(value);
}
}
return optional;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
index 5b44175..f746a7b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
@@ -219,10 +219,10 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction {
cmd.setLabel(form.getString(LABEL));
- cmd.setActive(new
- Boolean(BooleanUtils.toBoolean((Boolean) form.get(ACTIVE))));
- cmd.setIsOrgDefault(new
- Boolean(BooleanUtils.toBoolean((Boolean) form.get(ORG_DEFAULT))));
+ cmd.setActive(Boolean.valueOf(
+ BooleanUtils.toBoolean((Boolean) form.get(ACTIVE))));
+ cmd.setIsOrgDefault(Boolean.valueOf(
+ BooleanUtils.toBoolean((Boolean) form.get(ORG_DEFAULT))));
cmd.getKickstartData().setPostLog(
BooleanUtils.toBoolean((Boolean) form.get(POST_LOG)));
cmd.getKickstartData().setPreLog(
10 years, 4 months
java/code
by mkollar
java/code/src/com/redhat/rhn/domain/common/ChecksumFactory.java | 1 -
java/code/src/com/redhat/rhn/domain/common/LoggingFactory.java | 1 -
java/code/src/com/redhat/rhn/domain/org/OrgConfig.java | 1 -
java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupFactory.java | 1 -
java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java | 1 -
java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 2 --
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ExtraPackagesListAction.java | 1 -
java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java | 8 --------
java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java | 3 ---
java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java | 4 ----
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 3 ---
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 3 ---
java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java | 9 ---------
java/code/src/com/redhat/rhn/manager/system/CrashManager.java | 4 ----
15 files changed, 2 insertions(+), 44 deletions(-)
New commits:
commit 178e84dba7ab75e66503fc7b0f3da33080a111f4
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Fri Jan 10 13:44:49 2014 +0100
Eliminate unused private fields
diff --git a/java/code/src/com/redhat/rhn/domain/common/ChecksumFactory.java b/java/code/src/com/redhat/rhn/domain/common/ChecksumFactory.java
index 4af52fa..be960b6 100644
--- a/java/code/src/com/redhat/rhn/domain/common/ChecksumFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/common/ChecksumFactory.java
@@ -31,7 +31,6 @@ import java.sql.Types;
*/
public class ChecksumFactory extends HibernateFactory {
- private static ChecksumFactory singleton = new ChecksumFactory();
private static Logger log = Logger.getLogger(ChecksumFactory.class);
/**
diff --git a/java/code/src/com/redhat/rhn/domain/common/LoggingFactory.java b/java/code/src/com/redhat/rhn/domain/common/LoggingFactory.java
index 90c0442..0062646 100644
--- a/java/code/src/com/redhat/rhn/domain/common/LoggingFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/common/LoggingFactory.java
@@ -33,7 +33,6 @@ import java.util.Map;
*/
public class LoggingFactory extends HibernateFactory {
- private static LoggingFactory singleton = new LoggingFactory();
private static Logger log = Logger.getLogger(LoggingFactory.class);
public static final String SETUP_LOG_USER = "SETUP";
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java b/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java
index fe02dc6..9202012 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgConfig.java
@@ -27,7 +27,6 @@ public class OrgConfig extends BaseDomainHelper {
protected static Logger log = Logger.getLogger(OrgConfig.class);
private Long orgId;
- private Org org;
private boolean stagingContentEnabled;
private boolean crashReportingEnabled;
private boolean crashfileUploadEnabled;
diff --git a/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupFactory.java b/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupFactory.java
index 59cb4c6..e0a84f0 100644
--- a/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/org/usergroup/UserGroupFactory.java
@@ -29,7 +29,6 @@ import org.apache.log4j.Logger;
*/
public class UserGroupFactory extends HibernateFactory {
- private static UserGroupFactory singleton = new UserGroupFactory();
private static Logger log = Logger.getLogger(UserGroupFactory.class);
private UserGroupFactory() {
diff --git a/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java b/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java
index 423c9e4..95a6506 100644
--- a/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java
@@ -30,7 +30,6 @@ import java.util.List;
*/
public class TokenPackageFactory extends HibernateFactory {
- private static TokenPackageFactory singleton = new TokenPackageFactory();
private static Logger log = Logger.getLogger(TokenPackageFactory.class);
/**
diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
index a881de6..a34b9d3 100644
--- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
@@ -462,7 +462,7 @@ public class UserFactory extends HibernateFactory {
CallableMode m = ModeFactory.getCallableMode("User_queries",
"update_perms_for_user");
Map<String, Object> inParams = new HashMap<String, Object>();
- inParams.put("user_id", usr.getId());
+ inParams.put(USER_ID, usr.getId());
m.execute(inParams, new HashMap<String, Integer>());
}
@@ -733,7 +733,7 @@ public class UserFactory extends HibernateFactory {
"delete_user");
Map<String, Object> inParams = new HashMap<String, Object>();
Map<String, Integer> outParams = new HashMap<String, Integer>();
- inParams.put("user_id", userId);
+ inParams.put(USER_ID, userId);
m.execute(inParams, outParams);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java
index a091868..7fb7c51 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java
@@ -84,8 +84,6 @@ public class OverviewAction extends RhnAction {
private static final String DEPLOY_FILES_URL =
"/rhn/systems/details/configuration/DeployFile.do";
- private static final String COMPARE_FILES_URL =
- "/rhn/systems/details/configuration/DiffFile.do";
private static final String ACTION_DETAILS_URL =
"/network/systems/details/history/event.pxt";
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ExtraPackagesListAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ExtraPackagesListAction.java
index 6f66f56..fd9ce96 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ExtraPackagesListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ExtraPackagesListAction.java
@@ -27,7 +27,6 @@ import com.redhat.rhn.manager.system.SystemManager;
* ExtraPackagesListAction
*/
public class ExtraPackagesListAction extends BaseSystemPackagesAction {
- private static final String LIST_NAME = "extraPackageList";
public static final String DATA_SET = "extras";
@Override
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java b/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
index d3513ed..01c2934 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ChannelTreeNode.java
@@ -37,7 +37,6 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
private Long id;
private String name;
- private Long depth;
private Long channelArchId;
private Long currentMembers;
private Long availableMembers;
@@ -243,13 +242,6 @@ public class ChannelTreeNode extends BaseDto implements BaseListDto,
}
/**
- * @param depthIn The depth to set.
- */
- public void setDepth(Long depthIn) {
- this.depth = depthIn;
- }
-
- /**
* @return Returns the packageCount.
*/
public Long getPackageCount() {
diff --git a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java
index d2db2ea..236a96a 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/NewCloneErrataAction.java
@@ -21,7 +21,6 @@ import com.redhat.rhn.common.messaging.EventMessage;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.ErrataFactory;
import com.redhat.rhn.manager.errata.ErrataManager;
-import org.apache.log4j.Logger;
/**
* NewCloneErrataAction
@@ -30,8 +29,6 @@ import org.apache.log4j.Logger;
public class NewCloneErrataAction
extends AbstractDatabaseAction {
- private static Logger log = Logger.getLogger(NewCloneErrataAction.class);
-
/**
* {@inheritDoc}
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java
index e9a8352..4d8272c 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java
@@ -42,7 +42,6 @@ import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.user.UserManager;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
import java.util.HashMap;
import java.util.Iterator;
@@ -61,9 +60,6 @@ import javax.servlet.http.HttpServletRequest;
*/
public class RequestContext {
- private static final Logger LOG = Logger.getLogger(RequestContext.class);
-
-
// Request IDs go here.
public static final String LABEL = "label";
public static final String USER_ID = "uid";
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
index bbeb061..a57f9c5 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
@@ -50,9 +50,6 @@ import com.redhat.rhn.frontend.taglibs.list.decorators.ExtraButtonDecorator;
public class ListTagUtil {
private static final String HIDDEN_TEXT = "<input type=\"hidden\" " +
"name=\"%s\" value=\"%s\"/>";
- private static final String IE_MAGIC_SNIPPET = "<!--[if IE]><input type=\"text\" " +
- "style=\"display: none;\" disabled=\"disabled\" size=\"1\" /><![endif]-->";
-
private ListTagUtil() {
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
index 3021e33..22fd070 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
@@ -42,8 +42,6 @@ import com.redhat.rhn.manager.system.CrashManager;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -61,7 +59,6 @@ import java.util.Map;
*/
public class CrashHandler extends BaseHandler {
- private static Logger log = Logger.getLogger(CrashHandler.class);
private static float freeMemCoeff = 0.9f;
private CrashCount getCrashCount(Server serverIn) {
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
index d43731b..529822e 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
@@ -60,7 +60,6 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand {
private String guestName;
private Long memoryAllocation;
private Long virtualCpus;
- private String storageType;
private Long localStorage;
private String filePath;
private String virtBridge;
@@ -271,14 +270,6 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand {
this.virtualCpus = virtualCpusIn;
}
-
- /**
- * @param storageTypeIn the storageType to set.
- */
- public void setStorageType(String storageTypeIn) {
- this.storageType = storageTypeIn;
- }
-
/**
* @return Returns the localStorage in GB
*/
diff --git a/java/code/src/com/redhat/rhn/manager/system/CrashManager.java b/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
index 909b452..b29f498 100644
--- a/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/CrashManager.java
@@ -29,16 +29,12 @@ import com.redhat.rhn.manager.BaseManager;
import java.io.File;
-import org.apache.log4j.Logger;
-
/**
* CrashManager
* @version $Rev$
*/
public class CrashManager extends BaseManager {
- private static Logger log = Logger.getLogger(CrashManager.class);
-
/**
* Lookup Crash by its ID and User.
* @param user User to check the permissions for.
10 years, 4 months
Changes to 'refs/tags/spacewalk-web-2.1.47-1'
by Michael Mraka
Tag 'spacewalk-web-2.1.47-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-01-10 12:38 +0000
Tagging package [spacewalk-web] version [2.1.47-1] in directory [web/].
Changes since spacewalk-java-2.1.112-1:
Duncan Mac-Vicar P (1):
perl List port to new css/markup
Michael Mraka (2):
replaced old monitoring images with icons
Automatic commit of package [spacewalk-web] release [2.1.47-1].
---
branding/templates/header.pxt | 4
rel-eng/packages/spacewalk-web | 2
web/modules/pxt/PXT/HTML.pm | 24 +++
web/modules/sniglets/Sniglets/ListView/List.pm | 170 ++++++++++++------------
web/modules/sniglets/Sniglets/ListView/Style.pm | 108 +++++++++++----
web/modules/sniglets/Sniglets/Servers.pm | 10 -
web/spacewalk-web.spec | 6
7 files changed, 211 insertions(+), 113 deletions(-)
---
10 years, 4 months
3 commits - branding/templates rel-eng/packages web/modules web/spacewalk-web.spec
by Michael Mraka
branding/templates/header.pxt | 4
rel-eng/packages/spacewalk-web | 2
web/modules/pxt/PXT/HTML.pm | 24 +++
web/modules/sniglets/Sniglets/ListView/List.pm | 170 ++++++++++++------------
web/modules/sniglets/Sniglets/ListView/Style.pm | 108 +++++++++++----
web/modules/sniglets/Sniglets/Servers.pm | 10 -
web/spacewalk-web.spec | 6
7 files changed, 211 insertions(+), 113 deletions(-)
New commits:
commit c8ee6585a8e17776fc11f85c5989351494ad39f5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 10 13:38:18 2014 +0100
Automatic commit of package [spacewalk-web] release [2.1.47-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 1cfac46e..c53825b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.46-1 web/
+2.1.47-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 4472789..04f8e02 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.46
+Version: 2.1.47
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Jan 10 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.47-1
+- replaced old monitoring images with icons
+- perl List port to new css/markup
+
* Fri Jan 10 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.46-1
- Deleting obsoleted perl pages
- removed dead js file
commit 9a985ace083d87a99469699afe3c19152bdb383d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 10 13:21:46 2014 +0100
replaced old monitoring images with icons
fixing
unknown icon type: "". at /usr/share/perl5/vendor_perl/PXT/HTML.pm line 596.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 4dd4186..4176dc0 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -272,27 +272,27 @@ sub system_monitoring_info {
return $ret unless defined $data->{MONITORING_STATUS};
if ($data->{MONITORING_STATUS} eq "CRITICAL") {
- $ret->{image} = '/img/rhn-mon-down.gif';
+ $ret->{icon} = 'monitoring-crit';
$ret->{status_str} = 'Critical probes';
$ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "WARNING") {
- $ret->{image} = '/img/rhn-mon-warning.gif';
+ $ret->{icon} = 'monitoring-warn';
$ret->{status_str} = 'Warning probes';
$ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "UNKNOWN") {
- $ret->{image} = '/img/rhn-mon-unknown.gif';
+ $ret->{icon} = 'monitoring-unknown';
$ret->{status_str} = 'Unknown probes';
$ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "PENDING") {
- $ret->{image} = '/img/rhn-mon-pending.gif';
+ $ret->{icon} = 'monitoring-pending';
$ret->{status_str} = 'Pending probes';
$ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
}
elsif ($data->{MONITORING_STATUS} eq "OK") {
- $ret->{image} = '/img/rhn-mon-ok.gif';
+ $ret->{icon} = 'monitoring-ok';
$ret->{status_str} = 'OK';
$ret->{system_link} = "/network/systems/details/probes/index.pxt?sid=${sid}";
}
commit 02a0a6549b97a7851a52e4a262f1704548545a83
Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de>
Date: Mon Jan 6 15:42:09 2014 +0100
perl List port to new css/markup
diff --git a/branding/templates/header.pxt b/branding/templates/header.pxt
index d90e605..c567b3a 100644
--- a/branding/templates/header.pxt
+++ b/branding/templates/header.pxt
@@ -21,6 +21,10 @@
<script src="/javascript/bootstrap.js"></script>
<script src="/javascript/spacewalk-essentials.js"></script>
<script src="/javascript/spacewalk-checkall.js"></script>
+
+ <script src="/rhn/dwr/engine.js"></script>
+ <script src="/rhn/dwr/util.js"></script>
+ <script src="/rhn/dwr/interface/DWRItemSelector.js"></script>
</head>
</pxt-passthrough>
diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm
index 7064042..dde1c7a 100644
--- a/web/modules/pxt/PXT/HTML.pm
+++ b/web/modules/pxt/PXT/HTML.pm
@@ -119,6 +119,7 @@ sub hidden {
#text(
# -name => foo,
# -value => foo,
+# -placeholder => foo,
# -maxlength => 30,
# -size => 15);
sub text{
@@ -129,7 +130,7 @@ sub text{
$class->_spew("->text no name given, defaulting to " . $e{-name});
}
- return $class->_format(\%e,"input type=\"text\"");
+ return $class->_format(\%e,"input class=\"form-control\" type=\"text\"");
}
#file(
@@ -451,6 +452,26 @@ sub link {
return sprintf qq{<a href="%s"$css_class$target>%s</a>}, $url, $label;
}
+sub button {
+ my $class = shift;
+ my $text = shift;
+ my %params = @_;
+
+ if (not exists $params{-name}) {
+ die "nameless button";
+ }
+
+ my @inner;
+ for my $attr (qw/value type name class/) {
+ next unless exists $params{"-$attr"};
+ push @inner, sprintf(qq{$attr="$params{-$attr}"});
+ }
+
+ my $inner_str = join(" ", @inner);
+
+ return qq{<button $inner_str>$text</button>};
+}
+
sub link2 {
my $class = shift;
my %params = validate(@_, { url => 1, text => 0, css => 0, target => 0, params => 0 });
@@ -527,6 +548,7 @@ my %rhn_icons = (
"header-errata-set" => "fa spacewalk-icon-patch-set",
"header-errata-set-add" => "fa pacewalk-icon-patchset-install",
"header-event-history" => "fa fa-suitcase",
+ "header-filter" => "fa fa-eye",
"header-help" => "fa fa-question-circle",
"header-info" => "fa fa-info-circle text-primary",
"header-package" => "fa spacewalk-icon-packages",
diff --git a/web/modules/sniglets/Sniglets/ListView/List.pm b/web/modules/sniglets/Sniglets/ListView/List.pm
index 47030ce..f5cada4 100644
--- a/web/modules/sniglets/Sniglets/ListView/List.pm
+++ b/web/modules/sniglets/Sniglets/ListView/List.pm
@@ -492,6 +492,17 @@ sub render_formvars {
sub render_alphabar {
my $self = shift;
+ my $pxt = shift;
+ my $content = shift;
+
+ # if there is no alphabar we still need the div there
+ my $template = $self->style->alphabar();
+ $template =~ s/\{alphabar_content\}/$content/;
+ return $template;
+}
+
+sub render_alphabar_content {
+ my $self = shift;
my $alphabar = shift;
my $pagesize = shift;
my $url = shift;
@@ -511,19 +522,15 @@ sub render_alphabar {
my $varstring = join('&', map { "$_=" . PXT::Utils->escapeURI($vars->{$_}) } keys %{$vars});
- push @ret, qq{<A HREF="$url?$varstring" class="list-alphabar-enabled">$alpha</A>};
+ push @ret, qq{<li><a href="$url?$varstring">$alpha</a></li>\n};
}
else {
- push @ret, qq {<span class="list-alphabar-disabled">$alpha</span>};
+ push @ret, qq {<li class="disabled"><a href="#">$alpha</a></li>\n};
}
}
- my $bar = qq(<div align="center"><strong>\n) . join("", @ret) . qq(\n</strong></div>\n<br />\n);
-
- my $html = $self->style->alphabar;
- $html =~ s/\{alphabar\}/$bar/;
-
- return $html;
+ my $bar = qq(<ul class="spacewalk-alphabar pagination pagination-sm">\n) . join("", @ret) . qq(\n</ul>\n);
+ return $bar;
}
sub render_filterbox {
@@ -536,10 +543,12 @@ sub render_filterbox {
throw "No 'sort_by' column for mode '" . $self->mode->{__name__} . "'\n" unless defined $filter_by;
- $ret .= q{<div class="filter-input">};
- $ret .= sprintf('Filter by %s: ', $filter_by->name);
+ $ret .= q{<div class="spacewalk-list-filter">};
+ $ret .= q{<div class="input-group input-group-sm">};
+
if ($self->filter_type eq 'text') {
- $ret .= PXT::HTML->text(-name => 'filter_value', -value => PXT::Utils->escapeHTML($self->filter_string || ''), -size => 12);
+ $ret .= PXT::HTML->text(-name => 'filter_value', -value => PXT::Utils->escapeHTML($self->filter_string || ''),
+ -placeholder => sprintf('Filter by %s: ', $filter_by->name));
$ret .= PXT::HTML->hidden(-name => 'prev_filter_value', -value => PXT::Utils->escapeHTML($self->filter_string || ''));
}
elsif ($self->filter_type eq 'select') {
@@ -554,8 +563,12 @@ sub render_filterbox {
throw "Unknown filter type: '" . $self->filter_type . "'";
}
- $ret .= " ";
- $ret .= PXT::HTML->submit_image(-src => '/img/button-go.gif', -alt => "Filter", -name => "filter_list");
+ $ret .= q{<div class="input-group-btn">};
+ $ret .= PXT::HTML->button(PXT::HTML->icon(-type => 'header-filter') , -type => 'submit', -name => "filter_list",
+ -class => "btn btn-default spacewalk-button-filter");
+ $ret .= q{</div>};
+
+ $ret .= q{</div>};
$ret .= q{</div>};
return $ret;
@@ -598,26 +611,6 @@ sub render_select_buttons {
return $block;
}
-sub render_set_info {
- my $self = shift;
- my $pxt = shift;
- my $block = shift;
- my $pos = shift;
-
- my $subst = { };
-
- if ($self->allow_selections($pxt) and $self->{__set__}) {
- my $num_contents = scalar $self->{__set__}->contents;
- $subst->{set_string} = sprintf('<span id="pagination_selcount_%s">(%s selected)</span>', $pos, $num_contents);
- }
- else {
- $subst->{set_string} = '';
- }
-
- $block = PXT::Utils->perform_substitutions($block, $subst);
- return $block;
-}
-
sub render_page_info {
my $self = shift;
my $pxt = shift;
@@ -674,10 +667,10 @@ sub render_pagination_buttons {
# show buttons
if ($lower != '1' || ($upper != $total)) {
- $back_buttons_str = $self->render_pagination_button("First", "/img/list-allbackward$back_status_str.gif", " |< ", $back_status);
- $back_buttons_str .= $self->render_pagination_button("Prev", "/img/list-backward$back_status_str.gif", " < ", $back_status);
- $forward_buttons_str = $self->render_pagination_button("Next", "/img/list-forward$forward_status_str.gif", " > ", $forward_status);
- $forward_buttons_str .= $self->render_pagination_button("Last", "/img/list-allforward$forward_status_str.gif", " >| ", $forward_status);
+ $back_buttons_str = $self->render_pagination_button("First", "fa fa-fast-backward", " |< ", $back_status);
+ $back_buttons_str .= $self->render_pagination_button("Prev", "fa fa-backward", " < ", $back_status);
+ $forward_buttons_str = $self->render_pagination_button("Next", "fa fa-forward", " > ", $forward_status);
+ $forward_buttons_str .= $self->render_pagination_button("Last", "fa fa-fast-forward", " >| ", $forward_status);
}
my %subst;
@@ -693,23 +686,22 @@ sub render_pagination_buttons {
sub render_pagination_button {
my $self = shift;
my $name = shift;
- my $img_file = shift;
+ my $icon_class = shift;
my $text = shift;
my $is_active = shift;
my $ret = '';
- if ($is_active) {
- $ret = <<EOH
-<input type="image" src="$img_file" border="0" name="$name" value="$text" class="list-nextprev-active" />
-EOH
- }
- else {
- $ret = <<EOH
-<img src="$img_file" border="0" alt="$text" title="$text" class="list-nextprev-inactive" />
-EOH
+ my $disabled = '';
+ unless ($is_active) {
+ $disabled = ' disabled';
}
+ $ret = <<EOH;
+<button class="btn btn-default btn-xs" type="submit" name="$name" value="$text"$disabled>
+<i class="$icon_class" title="$text"></i>
+</button>
+EOH
return $ret;
}
@@ -750,7 +742,7 @@ sub render_rows_header {
chomp($col_str);
- my $header = $self->style->header;
+ my $header = $self->style->table_header;
$header =~ s/\{header_row\}/$col_str/g;
@@ -766,7 +758,7 @@ sub render_rows_footer {
$numcols++;
}
- my $footer = $self->style->footer;
+ my $footer = $self->style->table_footer;
$footer =~ s/\{numcols\}/$numcols/g;
return $footer;
@@ -865,6 +857,18 @@ sub render_checkbox {
return $checkbox_template;
}
+sub render_pagination {
+ my $self = shift;
+ my $pxt = shift;
+
+ my $template = $self->style->pagination;
+
+ $template = $self->render_pagination_buttons($pxt, $template);
+ $template = $self->render_pagination_formvars($pxt, $template);
+ $template = $self->render_page_info($pxt, $template);
+ return $template;
+}
+
sub render_empty_list_message {
my $self = shift;
@@ -940,21 +944,43 @@ sub render {
if ($self->filter_string) {
$ret .= PXT::HTML->form_start(-name => 'rhn_list', -method => "POST", -action => $pxt->uri) . "\n";
- $ret .= $self->render_filterbox($pxt) . '<br />';
+
+ my $template = $self->style->header();
+ $template =~ s/\{alphabar\}//;
+ $template =~ s/\{pagination\}//;
+ my $filterbox = $self->render_filterbox($pxt);
+ $template =~ s/\{control_area\}/$filterbox/;
+
+ $ret .= $template;
$ret .= $self->render_empty_list_message();
$ret .= $self->render_formvars($pxt);
$ret .= PXT::HTML->hidden(-name => "pxt:trap", -value => $self->trap());
$ret .= PXT::HTML->hidden(-name => "list_mode", -value => $mode->{__name__});
if ($self->{__set__}) {
- $ret .= PXT::HTML->hidden(-name => "list_set_label", -value => $self->{__set__}->label);
+ $ret .= PXT::HTML->hidden(-name => "list_set_label", -value => $self->{__set__}->label);
}
+ $ret .= $self->style->footer;
+
+ $ret =~ s/\{alphabar\}//;
+ $ret =~ s/\{pagination\}//;
+ $ret =~ s/\{control_area\}//;
$ret .= PXT::HTML->form_end;
return $ret;
}
else {
- return $self->render_empty_list_message();
+ my $template = $self->style->header();
+
+ $ret .= $template;
+ $ret .= $self->render_empty_list_message();
+ $ret .= $self->style->footer;
+
+ $ret =~ s/\{alphabar\}//g;
+ $ret =~ s/\{pagination\}//g;
+ $ret =~ s/\{control_area\}//g;
+
+ return $ret;
}
}
@@ -964,15 +990,13 @@ sub render {
my $filter = ' ';
-
-
- my $alphabar;
+ my $alphabar_content;
if (exists $results{alphabar} && defined $results{alphabar}) {
- $alphabar = " ";
+ $alphabar_content = " ";
if (scalar @{$results{all_ids}} > $pxt->user->preferred_page_size) {
- $alphabar = $self->render_alphabar($results{alphabar},
+ $alphabar_content = $self->render_alphabar_content($results{alphabar},
$pxt->user->preferred_page_size,
$pxt->uri,
$self->formvars($pxt));
@@ -982,20 +1006,17 @@ sub render {
$filter = $self->render_filterbox($pxt);
}
- $ret .= $alphabar if $alphabar;
-
$ret .= PXT::HTML->form_start(-name => 'rhn_list', -method => "POST", -action => $pxt->uri) . "\n";
- my $pagination = $self->style->pagination;
+ my $header .= $self->style->header;
+ my $pagination = $self->render_pagination($pxt);
+ my $alphabar = $self->render_alphabar($pxt, $alphabar_content);
+ $header =~ s/\{alphabar\}/$alphabar/;
- $pagination = $self->render_pagination_buttons($pxt, $pagination);
- $pagination = $self->render_pagination_formvars($pxt, $pagination);
- $pagination = $self->render_set_info($pxt, $pagination, 'top');
- $pagination = $self->render_page_info($pxt, $pagination);
- $pagination =~ s/\{control_area\}/$filter/;
-
- $ret .= $pagination;
+ $header =~ s/\{pagination\}/$pagination/;
+ $header =~ s/\{control_area\}/$filter/;
+ $ret .= $header;
$ret .= $self->render_rows_header(\%acl_failures);
$self->init_row_counter();
@@ -1170,17 +1191,10 @@ sub render {
$ret .= $self->render_rows_footer();
- $pagination = $self->style->pagination;
-
- $pagination = $self->render_pagination_buttons($pxt, $pagination);
- $pagination = $self->render_set_info($pxt, $pagination, 'bottom');
- $pagination = $self->render_page_info($pxt, $pagination);
-
- $pagination = $self->render_select_buttons($pxt, $pagination, $acl_failures{'Select'});
-
- $pagination =~ s/\{hidden_vars\}//;
-
- $ret .= $pagination;
+ my $footer = $self->style->footer;
+ $footer =~ s/\{pagination\}/$pagination/;
+ $footer = $self->render_select_buttons($pxt, $footer, $acl_failures{'Select'});
+ $ret .= $footer;
$ret .= PXT::HTML->hidden(-name => "pxt:trap", -value => $self->trap());
$ret .= PXT::HTML->hidden(-name => "list_mode", -value => $mode->{__name__});
diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm b/web/modules/sniglets/Sniglets/ListView/Style.pm
index 288c615..486b1c1 100644
--- a/web/modules/sniglets/Sniglets/ListView/Style.pm
+++ b/web/modules/sniglets/Sniglets/ListView/Style.pm
@@ -35,7 +35,7 @@ sub header_column {
my $self = shift;
my $ret = <<EOQ;
- <th{attr_string}>{column_name}</th>
+ <th>{column_name}</th>
EOQ
return $ret;
@@ -45,16 +45,34 @@ sub header {
my $self = shift;
my $ret =<<EOQ;
-<div class="panel panel-default">
-<table class="table table-striped">
-<!-- Begin Header Row -->
- <thead>
- <tr>
-{header_row}
- </tr>
- </thead>
-<!-- End Header Row -->
+<div class="spacewalk-list">
+ <div class="spacewalk-list-top-addons">
+ {alphabar}
+ {pagination}
+ </div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <div class="spacewalk-list-head-addons">
+ {control_area}
+ </div>
+ </div>
+EOQ
+ return $ret;
+}
+
+sub table_header {
+ my $self = shift;
+
+ my $ret =<<EOQ;
+ <table class="table table-striped">
+ <!-- Begin Header Row -->
+ <thead>
+ <tr>
+ {header_row}
+ </tr>
+ </thead>
+ <!-- End Header Row -->
EOQ
return $ret;
@@ -75,11 +93,29 @@ EOQ
return $ret;
}
+sub table_footer {
+ my $self = shift;
+
+ my $ret =<<EOQ;
+ </table>
+EOQ
+ return $ret;
+}
+
sub footer {
my $self = shift;
my $ret =<<EOQ;
-</table>
+ <div class="panel-footer">
+ <div class="spacewalk-list-footer-addons">
+ {control_area}
+ </div>
+ </div>
+ </div>
+ <div class="spacewalk-list-bottom-addons">
+ {pagination}
+ </div>
+
</div>
EOQ
@@ -90,16 +126,14 @@ sub pagination {
my $self = shift;
my $ret =<<EOQ;
+ <div class="spacewalk-list-pagination">
<!-- Begin Pagination Buttons -->
- <table width="100%" class="list-pagination" align="center">
- <tr>
- <td valign="center" width="90%">{control_area}</td>
- <td valign="center" class="list-infotext"><strong>{current_lower}</strong> - <strong>{current_upper}</strong> of <strong>{total} {set_string}</strong>  </td>
- <td valign="center" class="list-navbuttons">{back_buttons_str} {forward_buttons_str}</td>
- </tr>
- </table>
-
+ <span id="list_min">{current_lower}</span> - <span id="list_max">{current_upper}</span> of <span id="list_total">{total}</span>
+ <div class="spacewalk-list-pagination-btns btn-group">
+ {back_buttons_str} {forward_buttons_str}
+ </div>
{hidden_vars}
+ </div>
<!-- End Pagination Buttons -->
EOQ
@@ -135,7 +169,7 @@ sub column {
my $self = shift;
my $ret =<<EOQ;
- <td{width_str}{align_str}{nowrap_str}{class_str}>
+ <td>
{col_data}
</td>
EOQ
@@ -159,7 +193,9 @@ sub empty_list_wrapper {
my $self = shift;
my $ret =<<EOQ;
- <div class="list-empty-message">{empty_list_message}</div>
+ <div class="panel-body">
+ <div class="list-empty-message">{empty_list_message}</div>
+ </div>
EOQ
return $ret;
@@ -169,11 +205,9 @@ sub alphabar {
my $self = shift;
my $ret =<<EOQ;
-<table width="100%" cellspacing="0" cellpadding="1">
- <tr valign="top">
- <td class="list-alphabar">{alphabar}</td>
- </tr>
-</table>
+ <div class="spacewalk-list-alphabar">
+ {alphabar_content}
+ </div>
EOQ
return $ret;
@@ -325,11 +359,31 @@ EOQ
return $ret;
}
+sub table_footer {
+ my $self = shift;
+
+ my $ret =<<EOQ;
+ </table>
+EOQ
+ return $ret;
+}
+
sub footer {
my $self = shift;
my $ret =<<EOQ;
-</table>
+ </div>
+ <div class="panel-footer">
+ <div class="spacewalk-list-footer-addons">
+ {control_area}
+ </div>
+ </div>
+
+ <div class="spacewalk-list-bottom-addons">
+ {pagination}
+ </div>
+
+</div>
EOQ
return $ret;
10 years, 4 months