spacewalk-commits March 2010

spacewalk-commits@lists.fedorahosted.org

9 participants
262 discussions

java/code
by Partha Aji 31 Mar '10

31 Mar '10

java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit f953b36556acd47f7efae8aa476003b271af0f00 Author: Partha Aji <paji(a)redhat.com> Date: Wed Mar 31 19:03:07 2010 -0400 577074 - Fix to remove invalid characters from a cobbler system record name diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java index c4380a1..085973a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.cobbler; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -270,8 +271,10 @@ public class CobblerSystemCreateCommand extends CobblerCommand { * @return String name of cobbler system record. */ public String getCobblerSystemRecordName() { + String sep = ConfigDefaults.get().getCobblerNameSeparator(); String name = this.server.getName().replace(' ', '_'); - return name + ":" + + name = name.replace(' ', '_').replaceAll("[^a-zA-Z0-9_-]", ""); + return name + sep + this.server.getOrg().getId(); }

1 0

java/code
by Partha Aji 31 Mar '10

31 Mar '10

java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml | 27 +++++++--- java/code/src/com/redhat/rhn/common/util/DynamicComparator.java | 8 +- java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java | 18 ++++++ java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp | 1 java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp | 3 - java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf | 1 6 files changed, 45 insertions(+), 13 deletions(-) New commits: commit b813e7d5ebf4118fb5742108db0c9f2c17f67aa7 Author: Partha Aji <paji(a)redhat.com> Date: Wed Mar 31 17:58:50 2010 -0400 574594 - Fixed date based sorting issues on 4 User List pages. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml index 26f10ad..f088ac3 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/User_queries.xml @@ -33,11 +33,13 @@ SELECT ugm.user_id <mode name="in_set" class="com.redhat.rhn.frontend.dto.UserOverview"> <query params="user_id, set_label"> - SELECT DISTINCT WC.id, WC.login_uc - FROM web_contact WC, rhnSet ST + SELECT DISTINCT WC.id, WC.login_uc,UI.last_logged_in + + FROM web_contact WC + inner join rhnSet ST on ST.element = WC.id + inner join rhnUserInfo UI on UI.user_id = wc.id WHERE ST.user_id = :user_id AND ST.label = :set_label - AND ST.element = WC.id ORDER BY WC.login_uc </query> <elaborator name="users_in_org_overview" /> @@ -48,8 +50,10 @@ ORDER BY WC.login_uc SELECT wc.id AS ID, wc.login, wc.login_uc, - wc.org_id + wc.org_id, + UI.last_logged_in FROM web_contact wc + inner join rhnUserInfo UI on UI.user_id = wc.id WHERE wc.org_id = :org_id ORDER BY wc.login_uc </query> @@ -107,8 +111,10 @@ ORDER BY UPPER(user_login), UIOO.user_id <query params="org_id"> SELECT wce.id AS ID, wce.login, - wce.login_uc - FROM rhnWebContactEnabled wce + wce.login_uc, + UI.last_logged_in + FROM rhnWebContactEnabled wce + inner join rhnUserInfo UI on UI.user_id = wce.id WHERE wce.org_id = :org_id ORDER BY wce.login_uc </query> @@ -119,9 +125,14 @@ ORDER BY wce.login_uc <query params="org_id"> SELECT wcd.id AS ID, wcd.login, - wcd.login_uc + wcd.login_uc, + (select max(wccl_exists.date_completed) + from rhnWebContactChangeLog wccl_exists + where wcd.id= wccl_exists.web_contact_id) as change_date, + UI.last_logged_in FROM rhnWebContactDisabled wcd - WHERE wcd.org_id = :org_id + inner join rhnUserInfo UI on UI.user_id = wcd.id + WHERE wcd.org_id = :org_id ORDER BY wcd.login_uc </query> <elaborator params=""> diff --git a/java/code/src/com/redhat/rhn/common/util/DynamicComparator.java b/java/code/src/com/redhat/rhn/common/util/DynamicComparator.java index 0e350c6..c207acc 100644 --- a/java/code/src/com/redhat/rhn/common/util/DynamicComparator.java +++ b/java/code/src/com/redhat/rhn/common/util/DynamicComparator.java @@ -83,11 +83,13 @@ public class DynamicComparator implements Comparator { if (val1 instanceof String && val2 instanceof String) { return order * getCollator().compare(val1, val2); } + // a < b = -1, a > b = 1 , a== b =0 + if (val1 == null && val2 != null) { - return -1; + return order * -1; } - else if (val2 == null && val1 != null) { - return 1; + else if (val1 != null && val2 == null) { + return order * 1; } else if (val1 == val2) { return 0; diff --git a/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java b/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java index 39e7a45..1934c1f 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/UserOverview.java @@ -45,12 +45,20 @@ public class UserOverview extends BaseDto { /** * @return Returns the changeDate. */ - public String getChangeDate() { + public String getChangeDateString() { if (changeDate == null) { return ""; } return LocalizationService.getInstance().formatDate(changeDate); } + + /** + * @return Returns the changeDate. + */ + public Date getChangeDate() { + return changeDate; + } + /** * @return Returns the changedByFirstName. */ @@ -176,6 +184,14 @@ public class UserOverview extends BaseDto { } /** + * get the last logged in time + * @return the last logged in time + */ + public Date getLastLoggedInDate() { + return lastLoggedIn; + } + + /** * Set the id * @param i the id to set. */ diff --git a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp index c581b81..c3c8313 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/activelist.jsp @@ -56,6 +56,7 @@  <rl:column attr="lastLoggedIn" + sortattr="lastLoggedInDate" bound="true" sortable="true" headerkey="userdetails.jsp.lastsign" diff --git a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp index 8753ee4..6755723 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/disabledlist.jsp @@ -53,7 +53,8 @@ <rl:column headerkey="disabledlist.jsp.disabledOn" bound="true" - attr="changeDate" + attr="changeDateString" + sortattr="changeDate" styleclass="last-column"/> </rl:list> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf index 7496eba..773f3a6 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/userlist_columns.jspf @@ -17,4 +17,5 @@ <rl:column bound="true" headerkey="userdetails.jsp.lastsign" sortable="true" + sortattr="lastLoggedInDate" attr="lastLoggedIn"/>

1 0

java/code
by Partha Aji 31 Mar '10

31 Mar '10

java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java | 8 ++++++++ 1 file changed, 8 insertions(+) New commits: commit e39ff19332331ea32cbaeecd5818b10a2a09cdfb Author: Partha Aji <paji(a)redhat.com> Date: Wed Mar 31 15:47:03 2010 -0400 577224 - Fixed an issue where when cloning KS profiles variables were not getting copied diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java index 052bca9..64b2445 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCloneCommand.java @@ -18,6 +18,8 @@ import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.user.User; +import org.cobbler.Profile; + /** * KickstartCloneCommand - class to clone a KickstartData object and its children * @version $Rev$ @@ -55,6 +57,12 @@ public class KickstartCloneCommand extends BaseKickstartCommand { clonedKickstart = this.ksdata.deepCopy(user, newLabel); KickstartWizardHelper helperCmd = new KickstartWizardHelper(user); helperCmd.store(clonedKickstart); + + Profile original = ksdata.getCobblerObject(user); + Profile cloned = clonedKickstart.getCobblerObject(user); + cloned.setKsMeta(original.getKsMeta()); + cloned.save(); + return null; }

1 0

Changes to 'refs/tags/spacewalk-backend-0.9.18-1'
by Partha Aji 31 Mar '10

31 Mar '10

Tag 'spacewalk-backend-0.9.18-1' created by Partha Aji <paji(a)redhat.com> at 2010-03-31 18:46 +0000 Tagging package [spacewalk-backend] version [0.9.18-1] in directory [backend/]. Changes since eventReceivers-2.20.14-1: Partha Aji (2): 575867 - Fixed a reg issue where config channels in a reactivation key + activation key combos got ranked the same. Automatic commit of package [spacewalk-backend] release [0.9.18-1]. --- backend/server/rhnServer/server_token.py | 35 +++++++++++++++---------------- backend/spacewalk-backend.spec | 8 ++++++- rel-eng/packages/spacewalk-backend | 2 - 3 files changed, 26 insertions(+), 19 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Partha Aji 31 Mar '10

31 Mar '10

backend/spacewalk-backend.spec | 8 +++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 67db499e108e259078defa2fd50222dc56b4d20c Author: Partha Aji <paji(a)redhat.com> Date: Wed Mar 31 14:46:06 2010 -0400 Automatic commit of package [spacewalk-backend] release [0.9.18-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 5debe9a..c6e519f 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -8,7 +8,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.9.17 +Version: 0.9.18 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -630,6 +630,12 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Wed Mar 31 2010 Partha Aji <paji(a)redhat.com> 0.9.18-1 +- 575867 - Fixed a registration issue where config channels + in reactivation key + activation key combination got ranked + the same value causing all sorts of errors. (paji(a)redhat.com) +- 175155 - require specific version of rhnlib (msuchy(a)redhat.com) + * Tue Mar 30 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.17-1 - 577668 - fixed spacewalk-repo-sync behaviour for ftp and file diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index d305c10..14bb39a 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.9.17-1 backend/ +0.9.18-1 backend/

1 0

backend/server
by Partha Aji 31 Mar '10

31 Mar '10

backend/server/rhnServer/server_token.py | 35 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) New commits: commit e7bd176597341ed36deaacc3e8d83af966da67f1 Author: Partha Aji <paji(a)redhat.com> Date: Wed Mar 31 14:44:50 2010 -0400 575867 - Fixed a reg issue where config channels in a reactivation key + activation key combos got ranked the same. diff --git a/backend/server/rhnServer/server_token.py b/backend/server/rhnServer/server_token.py index bb2f6fd..9864ad4 100644 --- a/backend/server/rhnServer/server_token.py +++ b/backend/server/rhnServer/server_token.py @@ -370,18 +370,20 @@ def _get_token_config_channels(token_id): return h.fetchall_dict() or [] _query_current_config_channels = rhnSQL.Statement(""" - select server_id, config_channel_id + select config_channel_id from rhnServerConfigChannel + where server_id = :server_id + and position is not null """) -def _get_current_config_channels(): +def _get_current_config_channels(server_id): h = rhnSQL.prepare(_query_current_config_channels) - h.execute() + h.execute(server_id = server_id) current_ch = h.fetchall_dict() or [] data = [] for curr in current_ch: - data.append((curr['server_id'],curr['config_channel_id'])) + data.append(curr['config_channel_id']) return data @@ -400,29 +402,28 @@ def token_config_channels(server, tokens_obj): config_channels = [] config_channels_hash = {} deployment = 0 + current_channels = [] + if tokens_obj.forget_rereg_token: + current_channels = _get_current_config_channels(server_id) + for token in tokens_obj.tokens: channels = _get_token_config_channels(token['token_id']) # Check every token used and if any of them are set to not deploy configs # then we won't deploy configs for any config channels the system is subscribed to deploy_configs = token['deploy_configs'] log_debug(2, "token_id: ", token['token_id'], " deploy_configs: ", deploy_configs) - if deploy_configs == 'Y': + if deploy_configs == 'Y': log_debug(2, "At least one token set to deploy config files") deployment = 1 for c in channels: config_channel_id = c['config_channel_id'] - if tokens_obj.forget_rereg_token: - current_channels = _get_current_config_channels() - if (server_id, c['config_channel_id']) in current_channels: - continue - if config_channels_hash.has_key(config_channel_id): - # Already added - continue - position = len(config_channels) + 1 - # Update the position in the queue - c['position'] = position - config_channels.append(c) - config_channels_hash[config_channel_id] = None + if not c['config_channel_id'] in current_channels and\ + not config_channels_hash.has_key(config_channel_id): + position = len(current_channels) + len(config_channels) + 1 + # Update the position in the queue + c['position'] = position + config_channels.append(c) + config_channels_hash[config_channel_id] = None ret = [] if config_channels:

1 0

Changes to 'refs/tags/spacewalk-web-0.9.7-1'
by Miroslav Suchý 31 Mar '10

31 Mar '10

Tag 'spacewalk-web-0.9.7-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-03-31 15:26 +0000 Tagging package [spacewalk-web] version [0.9.7-1] in directory [web/]. Changes since rhn-client-tools-0.9.11-1: Miroslav Suchý (1): Automatic commit of package [spacewalk-web] release [0.9.7-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/perl-NOCpulse-Gritch-1.27.5-1'
by Miroslav Suchý 31 Mar '10

31 Mar '10

Tag 'perl-NOCpulse-Gritch-1.27.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-03-31 15:29 +0000 Tagging package [perl-NOCpulse-Gritch] version [1.27.5-1] in directory [monitoring/PerlModules/NP/Gritch/]. Changes since rhn-client-tools-0.9.11-1: Miroslav Suchý (2): Automatic commit of package [spacewalk-web] release [0.9.7-1]. Automatic commit of package [perl-NOCpulse-Gritch] release [1.27.5-1]. --- monitoring/PerlModules/NP/Gritch/perl-NOCpulse-Gritch.spec | 5 ++++- rel-eng/packages/perl-NOCpulse-Gritch | 2 +- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) ---

1 0

Changes to 'refs/tags/eventReceivers-2.20.14-1'
by Miroslav Suchý 31 Mar '10

31 Mar '10

Tag 'eventReceivers-2.20.14-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-03-31 15:35 +0000 Tagging package [eventReceivers] version [2.20.14-1] in directory [monitoring/eventReceivers/]. Changes since SputLite-0.48.12-1: Miroslav Suchý (1): Automatic commit of package [eventReceivers] release [2.20.14-1]. --- monitoring/eventReceivers/eventReceivers.spec | 6 +++++- rel-eng/packages/eventReceivers | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/SputLite-0.48.12-1'
by Miroslav Suchý 31 Mar '10

31 Mar '10

Tag 'SputLite-0.48.12-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-03-31 15:34 +0000 Tagging package [SputLite] version [0.48.12-1] in directory [monitoring/SputLite/]. Changes since spacewalk-java-0.9.14-1: Miroslav Suchý (1): Automatic commit of package [SputLite] release [0.48.12-1]. --- monitoring/SputLite/SputLite.spec | 5 ++++- rel-eng/packages/SputLite | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits March 2010