web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 37 --------------
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 34 ------------
2 files changed, 71 deletions(-)
New commits:
commit 9aa5611b85703c4d8d3c4217f47a5e98173d323e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:58:38 2009 +0100
rhn-listview mode kickstart_sessions_for_org not used, making
kickstart_sessions_provider and query kickstart_sessions_for_org obsolete as well,
removing.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index d002b5c..b30ed2c 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -252,43 +252,6 @@ ORDER BY KTT.id, KT.label
</query>
</mode>
-<mode name="kickstart_sessions_for_org">
- <query params="org_id, days">
- SELECT KSS.id,
- KSS.kickstart_id,
- KSS.org_id,
- KSS.old_server_id,
- KSS.new_server_id,
- KSS.state_id,
- KSSS.label AS state_label,
- KSSS.name AS state_name,
- KSS.action_id,
- TO_CHAR((SELECT MAX(time)
- FROM rhnKickstartSessionHistory KSH
- WHERE KSH.kickstart_session_id = KSS.id), 'YYYY-MM-DD
HH24:MI:SS') AS last_action,
- KSS.kstree_id
- FROM rhnKickstartSession KSS,
- rhnKickstartSessionState KSSS
- WHERE KSS.org_id = :org_id
- AND KSSS.id = KSS.state_id
- AND NOT ((KSSS.label = 'failed' OR KSSS.label = 'complete') AND
KSS.last_action < sysdate - :days)
-ORDER BY last_action DESC, state_label, KSS.id
- </query>
- <elaborator params="">
-SELECT KSS.id, C.name as dist
- FROM rhnKickstartSession KSS, rhnKickstartableTree KST, rhnChannel C
- WHERE KSS.id IN (%s)
- AND KST.id = KSS.kstree_id
- AND KST.channel_id = C.id
- </elaborator>
- <elaborator params="">
-SELECT KSS.id, S.name AS system_name
- FROM rhnKickstartSession KSS, rhnServer S
- WHERE KSS.id IN (%s)
- AND S.id = KSS.old_server_id
- </elaborator>
-</mode>
-
<mode name="kickstart_session_history">
<query params="kssid">
SELECT KSH.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index e5702b9..a1d85be 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -100,10 +100,6 @@ sub _register_modes {
-datasource => RHN::DataSource::General->new,
-action_callback => \&kickstart_packages_cb);
- Sniglets::ListView::List->add_mode(-mode =>
"kickstart_sessions_for_org",
- -datasource => RHN::DataSource::General->new,
- -provider => \&kickstart_sessions_provider);
-
Sniglets::ListView::List->add_mode(-mode =>
"kickstart_session_history",
-datasource => RHN::DataSource::General->new,
-provider => \&session_history_provider);
@@ -196,36 +192,6 @@ sub kickstarts_for_org_provider {
return (%ret);
}
-sub kickstart_sessions_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt, -days =>
$pxt->dirty_param('days_of_history') || 1);
-
- foreach my $row (@{$ret{data}}) {
-
- if ( exists $row->{LAST_ACTION} ) {
- $row->{LAST_ACTION} = $pxt->user->convert_time($row->{LAST_ACTION});
- }
-
- unless ($row->{SYSTEM_NAME}) {
- $row->{SYSTEM_NAME} = '(New Profile)';
- }
-
- if (not $row->{DIST}) {
- if ($row->{KICKSTART_ID}) {
- my $ks = RHN::Kickstart->lookup(-id => $row->{KICKSTART_ID});
- $row->{DIST} = $ks->dist || '(unknown)';
- }
- else {
- $row->{DIST} = '(unknown)';
- }
- }
- }
-
- return (%ret);
-}
-
sub session_history_provider {
my $self = shift;
my $pxt = shift;
Show replies by date