java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d98350c5c60828ab7b9fcdf90cffa5edcc04c8d8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 25 11:39:22 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.75-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0a7d734..ecda104 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.74
+Version: 1.8.75
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 25 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.75-1
+- store also config revision changed_by_id
+- fix ConfigurationFactoryTest.testRemoveConfigChannel
+
* Thu May 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.74-1
- 825024 - API *must* check for compatible channels in system.setBaseChannel()
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index cbff66e..3581371 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.74-1 java/
+1.8.75-1 java/
11 years, 11 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 4 ++++
java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 1ce8c8a7f52a9ea393a7bb5c5741ecd841a5fbef
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 25 11:33:04 2012 +0200
store also config revision changed_by_id
and fix ConfigurationFactoryTest.testCreateNewRevisionFromStream test
diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
index b14ec06..5105e08 100644
--- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java
@@ -304,8 +304,12 @@ public class ConfigurationFactory extends HibernateFactory {
ConfigFile file = revision.getConfigFile();
commit(file);
if (revision.getId() == null) {
+ // save changedById, because saveNewConfigRevision does not handle it
+ // and set it after reload not to lose it
+ Long changedById = revision.getChangedById();
Long revId = saveNewConfigRevision(revision);
revision = (ConfigRevision) getSession().get(ConfigRevision.class, revId);
+ revision.setChangedById(changedById);
file.setLatestConfigRevision(revision);
//and now we have to save the file again
//it would be nice to save it only once, but we require the file id
commit f67945ed65091983ea9a8328b69b0ebf1b65760a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 25 11:05:00 2012 +0200
fix ConfigurationFactoryTest.testRemoveConfigChannel
diff --git a/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java b/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java
index 2fbf790..b0ddf99 100644
--- a/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java
+++ b/java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java
@@ -217,7 +217,7 @@ public class ConfigurationFactoryTest extends RhnBaseTestCase {
Session session = HibernateFactory.getSession();
session.flush();
session.evict(channel);
- //session.evict(file); //TODO: figure out why we don't have to evict this one.
+ session.evict(file);
session.evict(cr.getConfigFile());
session.evict(cr);
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.74-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.8.74-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-05-24 21:03 +0000
Tagging package [spacewalk-java] version [1.8.74-1] in directory [java/].
Changes since spacewalk-java-1.8.73-1:
Miroslav Suchý (2):
825024 - API *must* check for compatible channels in system.setBaseChannel()
Automatic commit of package [spacewalk-java] release [1.8.74-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 13 ++++++++--
java/spacewalk-java.spec | 5 +++
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 16 insertions(+), 4 deletions(-)
---
11 years, 11 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 13 ++++++++--
java/spacewalk-java.spec | 5 +++
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 52a65aad86a4bf5525c90af39a5bcc0882d44c61
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 23:03:47 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.74-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6a13730..0a7d734 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.73
+Version: 1.8.74
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.74-1
+- 825024 - API *must* check for compatible channels in system.setBaseChannel()
+
* Thu May 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.73-1
- 820987 - fix error during backporting
- 820987 - do not guess creator name
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 31e94e1..cbff66e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.73-1 java/
+1.8.74-1 java/
commit b3227d5e7a56944b7e9b62529ffba7a69d03963e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 23:03:03 2012 +0200
825024 - API *must* check for compatible channels in system.setBaseChannel()
backported from hosted commit 7fa497ea87861b69cfa30e50418f24347a275fa3
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 0bd4298..df662fd 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -84,6 +84,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.InvalidActionTypeException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelListException;
+import com.redhat.rhn.frontend.xmlrpc.InvalidChannelException;
import com.redhat.rhn.frontend.xmlrpc.InvalidEntitlementException;
import com.redhat.rhn.frontend.xmlrpc.InvalidPackageException;
import com.redhat.rhn.frontend.xmlrpc.InvalidProfileLabelException;
@@ -414,7 +415,11 @@ public class SystemHandler extends BaseHandler {
Server server = lookupServer(loggedInUser, sid);
UpdateBaseChannelCommand cmd =
new UpdateBaseChannelCommand(loggedInUser, server, new Long(cid.longValue()));
- cmd.store();
+ ValidatorError ve = cmd.store();
+ if (ve != null) {
+ throw new InvalidChannelException(
+ LocalizationService.getInstance().getMessage(ve.getKey(), ve.getValues()));
+ }
return 1;
}
@@ -465,7 +470,11 @@ public class SystemHandler extends BaseHandler {
throw new InvalidChannelLabelException();
}
}
- cmd.store();
+ ValidatorError ve = cmd.store();
+ if (ve != null) {
+ throw new InvalidChannelException(
+ LocalizationService.getInstance().getMessage(ve.getKey(), ve.getValues()));
+ }
return 1;
}
11 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.8.73-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.8.73-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-05-24 19:18 +0000
Tagging package [spacewalk-java] version [1.8.73-1] in directory [java/].
Changes since spacewalk-schema-1.8.40-1:
Miroslav Suchý (2):
820987 - fix error during backporting
Automatic commit of package [spacewalk-java] release [1.8.73-1].
---
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 2 +-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
11 years, 11 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 2 +-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 3b07ac1233894fc91f14dc7a13132735538a7d0b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 21:18:14 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.73-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 67a99e8..6a13730 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.72
+Version: 1.8.73
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.73-1
+- 820987 - fix error during backporting
+- 820987 - do not guess creator name
+
* Thu May 24 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.72-1
- fix ConfigurationManagerTest.testCopyFile
- fix ConfigTestUtils.createConfigRevision
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b7ace5c..31e94e1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.72-1 java/
+1.8.73-1 java/
commit 387cdefd3b1fae2a1065753ba140096a51a40a77
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 21:17:37 2012 +0200
820987 - fix error during backporting
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
index 4767b35..1b5bd75 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
@@ -673,7 +673,7 @@ public class SystemOverview extends BaseDto implements Serializable {
* @param creatorNameIn The name to set of user who registered system.
*/
public void setCreatorName(String creatorNameIn) {
- this.creatorName = name;
+ this.creatorName = creatorNameIn;
}
/**
* @return Returns the created.
11 years, 11 months
Changes to 'refs/tags/spacewalk-schema-1.8.40-1'
by Miroslav Suchý
Tag 'spacewalk-schema-1.8.40-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-05-24 18:25 +0000
Tagging package [spacewalk-schema] version [1.8.40-1] in directory [schema/spacewalk/].
Changes since spacecmd-1.8.8-1:
Miroslav Suchý (3):
820987 - do not guess creator name
719609 - fix upgrades for arm
Automatic commit of package [spacewalk-schema] release [1.8.40-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 14 ++++-
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 13 ++---
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 25 ----------
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 13 +++--
java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 13 +++--
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql | 7 ++
8 files changed, 47 insertions(+), 45 deletions(-)
---
11 years, 11 months
3 commits - java/code rel-eng/packages schema/spacewalk
by Miroslav Suchý
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 14 ++++-
java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java | 13 ++---
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 25 ----------
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp | 13 +++--
java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp | 13 +++--
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5 +-
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql | 7 ++
8 files changed, 47 insertions(+), 45 deletions(-)
New commits:
commit 70380144a1fb14e41608e7df6f4ce47ea91dd524
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 20:25:46 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.40-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 30b3ce0..f7f4661 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.39-1 schema/spacewalk/
+1.8.40-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index ad804a2..c6cc62f 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.8.39
+Version: 1.8.40
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu May 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.40-1
+- 719609 - fix upgrades for arm
+
* Thu May 24 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.39-1
- 719609 - correct channel arch for armv7
commit e68af5d022394550d8f2e8e5800e90e11b140a22
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 20:25:18 2012 +0200
719609 - fix upgrades for arm
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
index 63ad54d..216f989 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
@@ -1,6 +1,13 @@
insert into rhnChannelArch (id, label, name, arch_type_id) values
(sequence_nextval('rhn_channel_arch_id_seq'), 'channel-arm', 'ARM soft. FP', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_package_arch_id_seq'), 'armv7l', 'ARMv7l', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_package_arch_id_seq'), 'armv6l', 'ARMv6l', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_package_arch_id_seq'), 'armv5tel', 'ARMv5tel', lookup_arch_type('rpm'));
+
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv7l'));
insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
commit 88793aa159235bd5109c0105381907df407ae4ae
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu May 24 13:52:15 2012 +0200
820987 - do not guess creator name
Instead of guessing, load creator-name when we find the systems.
If no name found, teach JSPs to say "Unknown".
Also, change nameOfUserWhoRegisteredSystem to something short enough.
backported from hosted c331aec0ada0b8760005d41b3f5217587b4c3840
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index d365719..a50c53a 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -862,7 +862,10 @@ SELECT S.id, S.NAME, S.info, S.created,
from rhnChannel C
inner join rhnServerChannel SC on SC.channel_id = C.id
where SC.server_id = S.id
- and C.parent_channel IS NULL) AS CHANNEL_LABELS
+ and C.parent_channel IS NULL) AS CHANNEL_LABELS,
+ (SELECT wc.login
+ FROM web_contact wc
+ WHERE wc.id = s.creator_id) as creator_name
FROM rhnServer S
WHERE S.org_id = :org_id
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
@@ -886,10 +889,15 @@ SELECT S.id, S.NAME, S.info, S.created,
from rhnChannel C
inner join rhnServerChannel SC on SC.channel_id = C.id
where SC.server_id = S.id
- and C.parent_channel IS NULL) AS CHANNEL_LABELS
+ and C.parent_channel IS NULL) AS CHANNEL_LABELS,
+ (SELECT wc.login
+ FROM web_contact wc
+ WHERE wc.id = s.creator_id) as creator_name
FROM rhnServer S
WHERE S.org_id = :org_id
- AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
+ AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP
+ WHERE USP.user_id = :user_id
+ AND USP.server_id = S.id)
ORDER BY S.created DESC
</query>
<elaborator name="system_overview" />
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
index b0deb06..4767b35 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemOverview.java
@@ -49,7 +49,7 @@ public class SystemOverview extends BaseDto implements Serializable {
private Long lastCheckinDaysAgo;
private Long pendingUpdates;
private String info;
- private String nameOfUserWhoRegisteredSystem;
+ private String creatorName;
private String os;
private String release;
private String serverArchName;
@@ -666,15 +666,14 @@ public class SystemOverview extends BaseDto implements Serializable {
/**
* @return Returns the nameOfUserWhoRegisteredSystem.
*/
- public String getNameOfUserWhoRegisteredSystem() {
- return nameOfUserWhoRegisteredSystem;
+ public String getCreatorName() {
+ return creatorName;
}
/**
- * @param nameOfUserWhoRegisteredSystemIn The nameOfUserWhoRegisteredSystem to set.
+ * @param creatorNameIn The name to set of user who registered system.
*/
- public void setNameOfUserWhoRegisteredSystem(
- String nameOfUserWhoRegisteredSystemIn) {
- this.nameOfUserWhoRegisteredSystem = nameOfUserWhoRegisteredSystemIn;
+ public void setCreatorName(String creatorNameIn) {
+ this.creatorName = name;
}
/**
* @return Returns the created.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 78240dc..b0368fb 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -91,8 +91,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.net.IDN;
/**
@@ -112,11 +110,6 @@ public class SystemManager extends BaseManager {
public static final String CAP_CONFIGFILES_BASE64_ENC =
"configfiles.base64_enc";
- public static final String[] INFO_PATTERNS = {
- "Registered by username = '(\\w+)' using rhn_register client",
- "rhn_register by username = '(\\w+)'",
- "Registered by (\\w+) using rhn_register client"};
-
public static final String NO_SLOT_KEY = "system.entitle.noslots";
private SystemManager() {
@@ -619,24 +612,6 @@ public class SystemManager extends BaseManager {
params.put("user_id", user.getId());
Map elabParams = new HashMap();
DataResult dr = makeDataResult(params, elabParams, pc, m);
-
- Iterator i = dr.iterator();
-
- while (i.hasNext()) {
- SystemOverview so = (SystemOverview) i.next();
-
- if (so.getInfo() != null) {
- for (int j = 0; j < INFO_PATTERNS.length; ++j) {
- Pattern pattern = Pattern.compile(INFO_PATTERNS[j]);
- Matcher matcher = pattern.matcher(so.getInfo());
-
- if (matcher.matches()) {
- so.setNameOfUserWhoRegisteredSystem(matcher.group(1));
- }
- }
- }
- }
-
return dr;
}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
index 7bb1a12..54dbcfe 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/recentlyRegistered.jsp
@@ -54,10 +54,15 @@
<rl:column bound="false"
headerkey="registeredlist.jsp.user"
>
- <c:if test="${current.nameOfUserWhoRegisteredSystem != null}">
- <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />" />
- <c:out value="${current.nameOfUserWhoRegisteredSystem}"/>
- </c:if>
+ <c:choose>
+ <c:when test="${current.creatorName != null}">
+ <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />" />
+ <c:out value="${current.creatorName}"/>
+ </c:when>
+ <c:otherwise>
+ <bean:message key="Unknown" />
+ </c:otherwise>
+ </c:choose>
</rl:column>
<rl:column bound="true"
diff --git a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
index 8f281d2..b6ce408 100644
--- a/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/registeredlist.jsp
@@ -89,10 +89,15 @@
bound="false"
headerkey="registeredlist.jsp.user"
sortattr="nameOfUserWhoRegisteredSystem" >
- <c:if test="${current.nameOfUserWhoRegisteredSystem != null}">
- <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />" />
- <c:out value="${current.nameOfUserWhoRegisteredSystem}"/>
- </c:if>
+ <c:choose>
+ <c:when test="${current.creatorName != null}">
+ <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />" />
+ <c:out value="${current.creatorName}"/>
+ </c:when>
+ <c:otherwise>
+ <bean:message key="Unknown" />
+ </c:otherwise>
+ </c:choose>
</rl:column>
<!-- Entitlement Column -->
11 years, 11 months
Changes to 'refs/tags/spacecmd-1.8.8-1'
by shardy
Tag 'spacecmd-1.8.8-1' created by Steven Hardy <shardy(a)redhat.com> at 2012-05-24 14:55 +0000
Tagging package [spacecmd] version [1.8.8-1] in directory [spacecmd/].
Changes since spacewalk-schema-1.8.39-1:
Steven Hardy (7):
spacecmd bugfix : *diff functions allow python 2.4 compatibility
spacecmd bugfix : improve configchannel_export operation on old API versions
spacecmd bugfix : Fix reference to non-existent variable
spacecmd bugfix : fix activationkey_import when no base-channel specified
spacecmd bugfix: activationkey_import don't add empty package/group lists
spacecmd bugfix : kickstart_getcontents fix character encoding error
Automatic commit of package [spacecmd] release [1.8.8-1].
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 10 +++++++++-
spacecmd/src/lib/activationkey.py | 17 +++++++++++++----
spacecmd/src/lib/configchannel.py | 20 +++++++++++++++++---
spacecmd/src/lib/kickstart.py | 7 ++++++-
spacecmd/src/lib/utils.py | 9 ++++++---
6 files changed, 52 insertions(+), 13 deletions(-)
---
11 years, 11 months
rel-eng/packages spacecmd/spacecmd.spec
by shardy
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit ff034345f9375f4b9ba7265545d968e6e471980a
Author: Steven Hardy <shardy(a)redhat.com>
Date: Thu May 24 15:55:17 2012 +0100
Automatic commit of package [spacecmd] release [1.8.8-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index c131680..9a2278f 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-1.8.7-1 spacecmd/
+1.8.8-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index 7441ce5..6edb394 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 1.8.7
+Version: 1.8.8
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -60,6 +60,14 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Thu May 24 2012 Steven Hardy <shardy(a)redhat.com> 1.8.8-1
+- spacecmd bugfix : kickstart_getcontents fix character encoding error
+- spacecmd bugfix: activationkey_import don't add empty package/group lists
+- spacecmd bugfix : fix activationkey_import when no base-channel specified
+- spacecmd bugfix : Fix reference to non-existent variable
+- spacecmd bugfix : improve configchannel_export operation on old API versions
+- spacecmd bugfix : *diff functions allow python 2.4 compatibility
+
* Tue May 15 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.7-1
- changed get_string_diff_dicts to better fitting replacement method
- bugfix and comment clarification
11 years, 11 months