backend/server
by Pradeep Kilambi
backend/server/importlib/backend.py | 10 ----------
1 file changed, 10 deletions(-)
New commits:
commit 2f289eae60a840d938f47ce5cebfe59de646f945
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Sep 21 12:41:55 2009 -0400
clean up
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index c7819b1..fffc7b4 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -514,11 +514,6 @@ class Backend:
def lookupPackages(self, packages, ignore_missing = 0):
# If nevra is enabled use md5sum as primary key
self.validate_pks()
- #tbs = self.tables['rhnPackage']
- #if CFG.ENABLE_NVREA:
- # # Add md5sum as a primarykey if nevra is enabled
- # if 'md5sum' not in tbs.pk:
- # tbs.pk.append('md5sum')
for package in packages:
if not isinstance(package, IncompletePackage):
raise TypeError("Expected an IncompletePackage instance, found %s" % \
@@ -696,11 +691,6 @@ class Backend:
forceVerify=0, transactional=0):
# Insert/update the packages
self.validate_pks()
- #tbs = self.tables['rhnPackage']
- #if CFG.ENABLE_NVREA:
- # Add md5sum as a primarykey if nevra is enabled
- # if 'md5sum' not in tbs.pk:
- # tbs.pk.append('md5sum')
childTables = {
'rhnPackageProvides': 'package_id',
14 years, 9 months
backend/server
by Pradeep Kilambi
backend/server/importlib/backend.py | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 614a497d6053968a6e30d35c02bbd84a1dfd74d7
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Mon Sep 21 11:34:49 2009 -0400
if nevra enabled use md5sum as a unique constraint for package pushes
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 1a3a9aa..c7819b1 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -512,6 +512,13 @@ class Backend:
self.__processHash('rhnPackageGroup', 'name', hash)
def lookupPackages(self, packages, ignore_missing = 0):
+ # If nevra is enabled use md5sum as primary key
+ self.validate_pks()
+ #tbs = self.tables['rhnPackage']
+ #if CFG.ENABLE_NVREA:
+ # # Add md5sum as a primarykey if nevra is enabled
+ # if 'md5sum' not in tbs.pk:
+ # tbs.pk.append('md5sum')
for package in packages:
if not isinstance(package, IncompletePackage):
raise TypeError("Expected an IncompletePackage instance, found %s" % \
@@ -688,12 +695,12 @@ class Backend:
def processPackages(self, packages, uploadForce=0, ignoreUploaded=0,
forceVerify=0, transactional=0):
# Insert/update the packages
-
- tbs = self.tables['rhnPackage']
- if CFG.ENABLE_NVREA:
+ self.validate_pks()
+ #tbs = self.tables['rhnPackage']
+ #if CFG.ENABLE_NVREA:
# Add md5sum as a primarykey if nevra is enabled
- if 'md5sum' not in tbs.pk:
- tbs.pk.append('md5sum')
+ # if 'md5sum' not in tbs.pk:
+ # tbs.pk.append('md5sum')
childTables = {
'rhnPackageProvides': 'package_id',
@@ -1962,6 +1969,14 @@ class Backend:
)
h = self.dbmodule.prepare(query)
apply(h.executemany, (), params)
+
+ def validate_pks(self):
+ # If nevra is enabled use md5sum as primary key
+ tbs = self.tables['rhnPackage']
+ if CFG.ENABLE_NVREA:
+ # Add md5sum as a primarykey if nevra is enabled
+ if 'md5sum' not in tbs.pk:
+ tbs.pk.append('md5sum')
# Returns a tuple for the hash's values
def build_key(hash, fields):
14 years, 9 months
schema/spacewalk
by Michael Mraka
schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-1-rhnPackageChangeLog-id.sql | 6 +++++-
schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-3-rhnPackageChangeLog-id-not-null.sql | 9 +++++----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 88cec86f324c49dc9d580429d3fb3498b65f6c5d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 21 14:13:16 2009 +0200
523389 - decrease TEMP usage
The standard way how to add a column with primary key on it is:
- add a column (nullable)
- fill it with data
- add primary key constraint
This will eat a lot of TEMP (it's necessary to read whole table
at once, sort the data and write it to the PK index) as well as
UNDO because it have to hold old data snapshot for one long
transaction.
So we decided to split one large update into smaller part (1 mil.
rows) which will save UNDO space. Moreover we can also build the PK
index per partes which will save TEMP space:
- add a column (nullable)
- add not null and PK constraints NOVALIDATE (this will create an
empty PK index and not yell 'ORA-01449: column contains NULL
values; cannot alter to NOT NULL')
- fill the column per partes with data (commit after 1 mil.
rows) which will also buid the PK index per partes
- VALIDATE constraints
diff --git a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-1-rhnPackageChangeLog-id.sql b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-1-rhnPackageChangeLog-id.sql
index c49ed94..f5c8733 100644
--- a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-1-rhnPackageChangeLog-id.sql
+++ b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-1-rhnPackageChangeLog-id.sql
@@ -1,4 +1,8 @@
alter table rhnPackageChangelog
-add id number;
+add id number
+ constraint rhn_pkg_cl_id_nn not null novalidate
+ constraint rhn_pkg_cl_id_pk primary key
+ using index tablespace [[64k_tbs]]
+ novalidate;
diff --git a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-3-rhnPackageChangeLog-id-not-null.sql b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-3-rhnPackageChangeLog-id-not-null.sql
index 7f3db05..a5463c4 100644
--- a/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-3-rhnPackageChangeLog-id-not-null.sql
+++ b/schema/spacewalk/upgrade/rhn-satellite-schema-5.1-to-spacewalk-schema-0.2/055-3-rhnPackageChangeLog-id-not-null.sql
@@ -1,7 +1,8 @@
alter table rhnPackageChangelog
-modify id
- constraint rhn_pkg_cl_id_nn not null
- constraint rhn_pkg_cl_id_pk primary key
- using index tablespace [[64k_tbs]];
+modify
+ constraint rhn_pkg_cl_id_nn validate;
+alter table rhnPackageChangelog
+modify
+ constraint rhn_pkg_cl_id_pk validate;
14 years, 9 months
Changes to 'refs/tags/rhnsd-4.5.12-1'
by Miroslav Suchý
Tag 'rhnsd-4.5.12-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-09-21 07:36 +0000
Tagging package [rhnsd] version [4.5.12-1] in directory [client/rhel/rhnsd/].
Changes since yum-rhn-plugin-0.7.2-1:
Jan Pazdziora (2):
Create the symlinks in .spec, based on .symlink "templates".
523393 - if the new path is longer than the old one, substr would return null, address those cases.
Joshua Roys (3):
Display 'File Type' as 'Symlink' in file details
Make reviewing empty audit sections possible
Fix audit machine listing/pagination
Justin Sherrill (2):
523926 - fixing issue with schedule event package list not paginating properly
adding script to help diagnose spacewalk-cobbler login issues
Milan Zazrivec (1):
523389 - add support for schema upgrade overrides
Miroslav Suchý (2):
bailout is defined in NOCpulse::NOCpulseini
Automatic commit of package [rhnsd] release [4.5.12-1].
---
backend/satellite_tools/updatePackages.py | 2
client/rhel/rhnsd/rhnsd.spec | 7 +-
java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java | 12 +++
java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java | 33 ++++++----
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 +++
java/code/src/com/redhat/rhn/manager/audit/AuditManager.java | 2
java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 2
java/code/webapp/WEB-INF/pages/audit/machine.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 13 ++-
java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 33 +++++++---
java/scripts/test_cobbler_sw_login.py | 22 ++++++
monitoring/NPalert/scripts/monitor-queue | 3
rel-eng/packages/rhnsd | 2
schema/spacewalk/spacewalk-schema-upgrade | 8 +-
spacewalk/config/etc/pki/tls/certs/spacewalk.crt | 1
spacewalk/config/etc/pki/tls/certs/spacewalk.crt.symlink | 1
spacewalk/config/etc/pki/tls/private/spacewalk.key | 1
spacewalk/config/etc/pki/tls/private/spacewalk.key.symlink | 1
spacewalk/config/spacewalk-config.spec | 7 ++
19 files changed, 127 insertions(+), 37 deletions(-)
---
14 years, 9 months
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhnsd/rhnsd.spec | 7 ++++++-
rel-eng/packages/rhnsd | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 7fb94549ff55e4eacb132e597f029ef8334bcc53
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 21 09:36:51 2009 +0200
Automatic commit of package [rhnsd] release [4.5.12-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec
index 3208ede..e1a88f7 100644
--- a/client/rhel/rhnsd/rhnsd.spec
+++ b/client/rhel/rhnsd/rhnsd.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhnsd
-Version: 4.5.11
+Version: 4.5.12
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +62,11 @@ rm -fr $RPM_BUILD_ROOT
%{_mandir}/man8/rhnsd.8*
%changelog
+* Mon Sep 21 2009 Miroslav Suchý <msuchy(a)redhat.com> 4.5.12-1
+- implement try-restart as alias for condrestart
+- add LSB header
+- change url, source0 and requires according to packaging guidelines
+
* Tue Jul 21 2009 John Matthews <jmatthew(a)redhat.com> 4.5.11-1
- #503719 - fix for postun scriptlet error (pkilambi(a)redhat.com)
diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd
index db4400d..27ed7b7 100644
--- a/rel-eng/packages/rhnsd
+++ b/rel-eng/packages/rhnsd
@@ -1 +1 @@
-4.5.11-1 client/rhel/rhnsd/
+4.5.12-1 client/rhel/rhnsd/
14 years, 9 months
java/scripts
by Justin Sherrill
java/scripts/test_cobbler_sw_login.py | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
New commits:
commit 60e9b30c1f9e4948e7225566ee13de31cf23f8ba
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 18 16:46:27 2009 -0400
adding script to help diagnose spacewalk-cobbler login issues
diff --git a/java/scripts/test_cobbler_sw_login.py b/java/scripts/test_cobbler_sw_login.py
new file mode 100644
index 0000000..1575dbe
--- /dev/null
+++ b/java/scripts/test_cobbler_sw_login.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+import sys
+from xmlrpclib import Server
+
+sys.path.append('/usr/share/rhn')
+try:
+ from common import initCFG, CFG
+except:
+ print "Couldn't load needed libs, Are you sure you are running this on a satellite?"
+ sys.exit(1)
+
+initCFG()
+user = 'taskomatic_user'
+passw = CFG.SESSION_SECRET_1
+
+c = Server('http://localhost/rpc/api')
+print("Satellite auth.checkAuthToken (should be 1): ")
+print( c.auth.checkAuthToken(user, passw))
+
+print("Trying cobbler login (should be a random token): ")
+c = Server('http://localhost/cobbler_api')
+print(c.login(user, passw))
14 years, 9 months
backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/updatePackages.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 013de18fe8c3b4de818140e06645096dabc4f071
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 18 15:56:15 2009 +0200
523393 - if the new path is longer than the old one, substr would return null, address those cases.
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index fb7bd15..0a6cdf2 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -118,7 +118,7 @@ _get_path_query = """
and rhnPackage.evr_id = rhnPackageEvr.id
and rhnPackage.package_arch_id = rhnPackageArch.id
)
- where '/' || new_path <> substr(path, -length(new_path) - 1)
+ where '/' || new_path <> nvl(substr(path, -length(new_path) - 1), 'x')
"""
_update_pkg_path_query = """
14 years, 9 months
spacewalk/config
by Jan Pazdziora
spacewalk/config/etc/pki/tls/certs/spacewalk.crt | 1 -
spacewalk/config/etc/pki/tls/certs/spacewalk.crt.symlink | 1 +
spacewalk/config/etc/pki/tls/private/spacewalk.key | 1 -
spacewalk/config/etc/pki/tls/private/spacewalk.key.symlink | 1 +
spacewalk/config/spacewalk-config.spec | 7 +++++++
5 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 99fb8ef87105d76e8fe5e1ae8cc2e1c817f9494a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 18 09:59:24 2009 +0200
Create the symlinks in .spec, based on .symlink "templates".
We do this to remove the dangling symlink from our repo.
diff --git a/spacewalk/config/etc/pki/tls/certs/spacewalk.crt b/spacewalk/config/etc/pki/tls/certs/spacewalk.crt
deleted file mode 120000
index 087f4e7..0000000
--- a/spacewalk/config/etc/pki/tls/certs/spacewalk.crt
+++ /dev/null
@@ -1 +0,0 @@
-../../../httpd/conf/ssl.crt/server.crt
\ No newline at end of file
diff --git a/spacewalk/config/etc/pki/tls/certs/spacewalk.crt.symlink b/spacewalk/config/etc/pki/tls/certs/spacewalk.crt.symlink
new file mode 100644
index 0000000..0d5e690
--- /dev/null
+++ b/spacewalk/config/etc/pki/tls/certs/spacewalk.crt.symlink
@@ -0,0 +1 @@
+Link to ../../../httpd/conf/ssl.crt/server.crt
diff --git a/spacewalk/config/etc/pki/tls/private/spacewalk.key b/spacewalk/config/etc/pki/tls/private/spacewalk.key
deleted file mode 120000
index 0445eb7..0000000
--- a/spacewalk/config/etc/pki/tls/private/spacewalk.key
+++ /dev/null
@@ -1 +0,0 @@
-../../../httpd/conf/ssl.key/server.key
\ No newline at end of file
diff --git a/spacewalk/config/etc/pki/tls/private/spacewalk.key.symlink b/spacewalk/config/etc/pki/tls/private/spacewalk.key.symlink
new file mode 100644
index 0000000..6d29ca3
--- /dev/null
+++ b/spacewalk/config/etc/pki/tls/private/spacewalk.key.symlink
@@ -0,0 +1 @@
+Link to ../../../httpd/conf/ssl.key/server.key
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 5d09248..f5af2ad 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -45,6 +45,13 @@ tar -C $RPM_BUILD_ROOT%{prepdir} -cf - etc \
echo "" > $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/rhn.conf
+find $RPM_BUILD_ROOT -name '*.symlink' | \
+ while read filename ; do linkname=${filename%.symlink} ; \
+ target=`sed -s 's/^Link to //' $filename` ; \
+ ln -sf $target $linkname ; \
+ rm -f $filename ; \
+ done
+
%clean
rm -rf $RPM_BUILD_ROOT
14 years, 9 months
3 commits - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java | 12 +++++++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 +++++++++
java/code/src/com/redhat/rhn/manager/audit/AuditManager.java | 2 -
java/code/webapp/WEB-INF/pages/audit/auditview.jsp | 2 -
java/code/webapp/WEB-INF/pages/audit/machine.jsp | 2 +
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf | 13 ++++++----
6 files changed, 34 insertions(+), 9 deletions(-)
New commits:
commit fc32595aaedc2cbb6cd7201aa350838a80f3490d
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Tue Sep 1 13:02:40 2009 -0400
Fix audit machine listing/pagination
diff --git a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
index 51a2ed4..9e11d01 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
@@ -309,7 +309,7 @@ public class AuditManager /* extends BaseManager */ {
Pattern fnregex = Pattern.compile("audit-(\\d+)-(\\d+).parsed");
// if machineName is null, look up all review sections by recursion
- if (machineName == null) {
+ if (machineName == null || machineName.length() == 0) {
dr = null;
for (AuditMachineDto aumachine : getMachines()) {
diff --git a/java/code/webapp/WEB-INF/pages/audit/machine.jsp b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
index ef3430f..bd6a7e6 100644
--- a/java/code/webapp/WEB-INF/pages/audit/machine.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/machine.jsp
@@ -63,6 +63,8 @@
</span>
</rl:column>
</rl:list>
+
+ <input type="hidden" name="machine" value="${machine}" />
</rl:listset>
</body>
commit eb9732a39a017f3c8390fb9c7f58888023fc3d18
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Tue Sep 1 11:58:11 2009 -0400
Make reviewing empty audit sections possible
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
index 7adefe6..074aab9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
@@ -193,6 +193,7 @@ public class AuditSearchAction extends RhnAction {
// if we have to process the DatePickers, it means that the user
// entered a time, which means it's probably not a reviewable
// section
+ unrev = true;
request.setAttribute("unreviewable", "true");
}
else if (!submitted && request.getParameter("machine") != null) {
@@ -216,8 +217,15 @@ public class AuditSearchAction extends RhnAction {
result = AuditManager.getAuditLogs(autypes, machine, start, end);
if (result == null) {
- amsgs.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("No results found!", false));
+ if (!unrev) {
+ // we need to be able to mark reviewable sections as
+ // 'reviewed' even if they're empty
+ result = new LinkedList();
+ }
+ else {
+ amsgs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("No results found!", false));
+ }
}
// check to see if this section has been reviewed
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 155164d..279a9dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -3483,6 +3483,12 @@ button below, and <b>will be unable to log back in</b>.</source>
<context context-type="sourcefile">/rhn/audit/Search.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="auditview.jsp.norecords">
+<source>No audit records found!</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/audit/Search.do</context>
+ </context-group>
+ </trans-unit>
<!-- == ERRATA == -->
<trans-unit id="erratalist.jsp.noerrata">
diff --git a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
index f0672e0..73a83ba 100644
--- a/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/auditview.jsp
@@ -203,7 +203,7 @@
<c:set var="resultList" value="${requestScope.result}" />
<rl:listset name="auditList">
- <rl:list dataset="resultList">
+ <rl:list dataset="resultList" emptykey="auditview.jsp.norecords">
<rl:column sortable="false"
bound="false"
headertext="Serial#"
commit 34213b52f5d96bd4a1423b1c044fbd5e2e3f113f
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Tue Sep 15 09:11:28 2009 -0400
Display 'File Type' as 'Symlink' in file details
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 86a1734..155164d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -14122,6 +14122,12 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
<context context-type="sourcefile">/rhn/configuration/file/FileDetails.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="filedetails.details.jspf.symlink">
+<source>Symlink</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/configuration/file/FileDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="filedetails.manage_header.jspf.label">
<source>{0} from channel <a href="{2}">{1}</a></source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
index 2eb5dda..94466b7 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/details.jspf
@@ -73,11 +73,14 @@
<th><bean:message key="filedetails.details.jspf.filetype-name" /></th>
<td>
<c:choose>
- <c:when test="${revision.directory}">
- <bean:message key="filedetails.details.jspf.directory" />
- </c:when>
- <c:otherwise>
- <rhn:require acl="config_channel_editable(${channel.id})"
+ <c:when test="${revision.directory}">
+ <bean:message key="filedetails.details.jspf.directory" />
+ </c:when>
+ <c:when test="${revision.symlink}">
+ <bean:message key="filedetails.details.jspf.symlink" />
+ </c:when>
+ <c:otherwise>
+ <rhn:require acl="config_channel_editable(${channel.id})"
mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler">
<html:select property="binary">
<html:option value="false">
14 years, 9 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java | 33 ++++++----
java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp | 33 +++++++---
2 files changed, 46 insertions(+), 20 deletions(-)
New commits:
commit 82e474c1c60eb318ccd786b7d8c04c342745beed
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 17 13:57:01 2009 -0400
523926 - fixing issue with schedule event package list not paginating properly
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java
index 5338e7f..8f8011e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java
@@ -14,21 +14,23 @@
*/
package com.redhat.rhn.frontend.action.schedule;
-import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.ActionFormatter;
import com.redhat.rhn.domain.action.ActionType;
import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnListAction;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.action.ActionManager;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -36,7 +38,7 @@ import javax.servlet.http.HttpServletResponse;
* PackageListSetupAction
* @version $Rev$
*/
-public class PackageListSetupAction extends RhnListAction {
+public class PackageListSetupAction extends RhnAction implements Listable {
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
@@ -45,17 +47,10 @@ public class PackageListSetupAction extends RhnListAction {
HttpServletResponse response) {
RequestContext requestContext = new RequestContext(request);
-
Long actionId = requestContext.getRequiredParam("aid");
-
User user = requestContext.getLoggedInUser();
- PageControl pc = new PageControl();
-
- clampListBounds(pc, request, user);
-
Action action = ActionManager.lookupAction(user, actionId);
- DataResult dr = ActionManager.getPackageList(actionId, pc);
ActionType type = action.getActionType();
if (type.equals(ActionFactory.TYPE_PACKAGES_UPDATE) ||
@@ -73,11 +68,25 @@ public class PackageListSetupAction extends RhnListAction {
request.setAttribute("type", "patchsets");
}
+
+ ListHelper helper = new ListHelper(this, request);
+ helper.execute();
+
+
ActionFormatter af = action.getFormatter();
request.setAttribute("actionname", af.getName());
- request.setAttribute("pageList", dr);
request.setAttribute("user", user);
+ request.setAttribute("aid", actionId);
return mapping.findForward("default");
}
+
+ /**
+ *
+ * {@inheritDoc}
+ */
+ public List getResult(RequestContext context) {
+ Long actionId = context.getParamAsLong("aid");
+ return ActionManager.getPackageList(actionId, null);
+ }
}
diff --git a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
index 29164ca..397f3d8 100644
--- a/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/schedule/packagelist.jsp
@@ -2,6 +2,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+
<html:xhtml/>
<html>
@@ -18,14 +20,29 @@
</div>
- <rhn:list pageList="${requestScope.pageList}"
- noDataText="packagelist.jsp.nopackages">
- <rhn:listdisplay>
- <rhn:column header="packagelist.jsp.name.${type}">
- ${current.nvre}
- </rhn:column>
- </rhn:listdisplay>
- </rhn:list>
+
+<rl:listset name="packset">
+
+<rl:list emptykey="packagelist.jsp.nopackages">
+
+ <rl:decorator name="ElaborationDecorator"/>
+
+
+ <rl:column sortable="true"
+ bound="false"
+ styleclass="first-column last-column"
+ headerkey="packagelist.jsp.name.${type}"
+ sortattr="nvre"
+ defaultsort="asc" >
+ ${current.nvre}
+ </rl:column>
+
+</rl:list>
+
+<input type="hidden" name="aid" value="${aid}">
+
+</rl:listset>
+
</body>
</html>
14 years, 9 months