3 commits - web/html
by Jan Pazdziora
web/html/formletters/account_deactivation_notice.xml | 6 -
web/html/formletters/rhn-sat-admin-chan-merg.xml | 42 -----------
web/html/network/systems/ssm/packages/remove_system_list.pxt | 27 -------
3 files changed, 75 deletions(-)
New commits:
commit 27bb27e2ef4a0231f8af24d48bdcd7f95ad408f7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 22:33:34 2009 +0100
formletters/rhn-sat-admin-chan-merg.xml not referenced from anywhere, the Knowledge Base article is not available either, removing.
diff --git a/web/html/formletters/rhn-sat-admin-chan-merg.xml b/web/html/formletters/rhn-sat-admin-chan-merg.xml
deleted file mode 100644
index 456e822..0000000
--- a/web/html/formletters/rhn-sat-admin-chan-merg.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<postal-letter subject="RHN Satellite Special Announcement, January 2005">
-
-RHN Satellite Special Announcement, January 2005
-
-On February 1, 2005, the Red Hat Network team will be making some changes to
-our services. These changes involve the structure of the Red Hat Enterprise
-Linux Channels, giving all Red Hat customers significantly greater choice in
-processor architectures by combining access to 32- and 64-bit architectures
-under a single subscription. Because we feel this presents a significant value
-we have chosen to implement this change in such a way as to grant this
-additional access to all of our Satellite customers.
-
-In order to make this change with a minimum risk of disrupting the
-management capabilities of existing deployed RHN Satellite installations
-we have chosen a solution which requires action at the customer side for
-this change to take place.
-
-Following the RHN scheduled production outage all existing Satellite
-systems will be unable to sync content until remedial actions are taken
-on the Satellite. The high-level process for reenabling sync
-capabilities is:
-
-1. generate and validate a Satellite backup (recommended)
-2. run up2date on the Satellite to receive the updated packages
-3. restart the Satellite service and UI
-4. run satellite-sync
-
-Upon completion of this process the Satellite will have downloaded a new
-entitlement certificate with the necessary changes along with deploying
-additional packages to support the improved synchronization protocol.
-
-If you have any questions regarding this transition, please feel free to
-contact your Red Hat Technical Representative.
-
-A *draft* Red Hat Knowledge Base article exists to discuss this change in
-detail and can be found at: http://kbase.redhat.com/faq/FAQ_49_4893.shtm
-
-<postal-template-replace label="email_footer"/>
-<postal-template-replace label="email_account_info"/>
-
-</postal-letter>
-
commit 68d5e7ebf7def7709f764c75e9738fb21aefcf39
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 22:31:29 2009 +0100
formletters/account_deactivation_notice.xml not referenced from anywhere, removing.
diff --git a/web/html/formletters/account_deactivation_notice.xml b/web/html/formletters/account_deactivation_notice.xml
deleted file mode 100644
index ab68c64..0000000
--- a/web/html/formletters/account_deactivation_notice.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<postal-letter>The Red Hat login <login /> has been deactivated in response to your request.
-
-Thank you for contacting Red Hat.
-<postal-template-replace label="email_footer"/>
-<postal-template-replace label="email_account_info"/>
-</postal-letter>
commit c018db4213e8c9a75586eaefd03987b5f5fc3663
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 22:23:08 2009 +0100
remove_system_list.pxt in ssm/packages is not referenced from anywhere, removing.
diff --git a/web/html/network/systems/ssm/packages/remove_system_list.pxt b/web/html/network/systems/ssm/packages/remove_system_list.pxt
deleted file mode 100644
index 0dc455e..0000000
--- a/web/html/network/systems/ssm/packages/remove_system_list.pxt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::Packages" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1>System Set Manager</h1>
-
- <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
-
-<h2>Systems with <rhn-lookup-package-nvre /> Installed</h2>
-
-<rhn-listview class="Sniglets::ListView::SystemList"
-mode="systems_with_package_nvre_in_set">
- <formvars>
- <var name="name_id" />
- <var name="evr_id" />
- </formvars>
- <column name="Name" label="server_name" align="left">
- <url>/rhn/systems/details/Overview.do?sid={column:id}</url>
- </column>
-</rhn-listview>
-
-</grail-canvas-template>
-</pxt-passthrough>
13 years, 5 months
3 commits - java/code web/html
by Jan Pazdziora
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
web/html/nav/sitenav-authenticated.xml | 1
web/html/network/monitoring/notifications/.htaccess | 8 -
web/html/network/monitoring/notifications/contact_methods/.htaccess | 9 -
web/html/network/monitoring/notifications/contact_methods/header.pxi | 11 --
web/html/network/software/channels/manage/errata/add_confirm.pxt | 46 ----------
6 files changed, 76 deletions(-)
New commits:
commit b0f2cd7047dbccf5acd3f540d47ef28fd5b46aac
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 21:02:28 2009 +0100
manage/errata/add_confirm.pxt not referenced from anywhere, removing.
diff --git a/web/html/network/software/channels/manage/errata/add_confirm.pxt b/web/html/network/software/channels/manage/errata/add_confirm.pxt
deleted file mode 100644
index 3322d54..0000000
--- a/web/html/network/software/channels/manage/errata/add_confirm.pxt
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Navi" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::ChannelEditor" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::Lists" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-include file="/network/software/channels/manage/manage_channels_header.pxi" />
-
- <div class="page-summary">
-
- <p>Click 'Confirm' below to add these errata to your channel. Related packages will also be added to the channel.</p>
- </div>
-
- <h2>
- <img src="/img/rhn-icon-errata.gif" />
-Confirm Errata Addition
- </h2>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<rhn-listview class="Sniglets::ListView::ErrataList" mode="in_set">
- <formvars>
- <var name="cid" />
- <var name="set_label" type="literal">errata_to_add</var>
- </formvars>
-
- <column name="Type" label="advisory_icon" width="5%" align="center" />
- <column name="Advisory" label="advisory_name" align="center">
- <url>/rhn/errata/manage/Edit.do?eid={column:id}</url>
- </column>
- <column name="Synopsis" label="advisory_synopsis" align="left" />
- <column name="Updated" label="advisory_last_updated" align="center" />
-
- <empty_list_message>No Errata.</empty_list_message>
-
- <action name="Confirm" label="add_errata" url="/network/software/channels/manage/errata/list.pxt" />
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
commit 6042fb4147353989abc788826ca63099bbb5acbf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 21:00:09 2009 +0100
/network/monitoring/notifications is not used anywhere, except Sniglets/ListView/ContactMethodList.pm where it points to nonexistent (as of Satellite 5.3) URLs anyway, removing.
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index c8f25bd..a5eeede 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -197,7 +197,6 @@
<rhn-tab name="Scout Config Push" acl="show_monitoring();" url="/network/monitoring/scout/index.pxt" />
<rhn-tab name="Notification" acl="show_monitoring()" url="/rhn/monitoring/config/notification/Methods.do">
<rhn-tab-url>/rhn/monitoring/config/notification/NotificationMethods.do</rhn-tab-url>
- <rhn-tab-directory>/network/monitoring/notifications/contact_methods</rhn-tab-directory>
<rhn-tab name="Filters" acl="show_monitoring()" url="/rhn/monitoring/config/notification/ActiveFilters.do">
<rhn-tab-directory>/rhn/monitoring/config/notification</rhn-tab-directory>
</rhn-tab>
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index 1102c14..e8ada19 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -163,7 +163,6 @@
</rhn-tab>
<rhn-tab name="Notification" url="/rhn/monitoring/config/notification/Methods.do">
<rhn-tab-url>rhn/monitoring/config/notification/NotificationMethods.do</rhn-tab-url>
- <rhn-tab-directory>/network/monitoring/notifications/contact_methods</rhn-tab-directory>
<rhn-tab name="Filters" url="/rhn/monitoring/config/notification/ActiveFilters.do"/>
</rhn-tab>
<rhn-tab name="Probe Suites" url="/rhn/monitoring/config/ProbeSuites.do">
diff --git a/web/html/network/monitoring/notifications/.htaccess b/web/html/network/monitoring/notifications/.htaccess
deleted file mode 100644
index 5da75a8..0000000
--- a/web/html/network/monitoring/notifications/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
diff --git a/web/html/network/monitoring/notifications/contact_methods/.htaccess b/web/html/network/monitoring/notifications/contact_methods/.htaccess
deleted file mode 100644
index b6960cf..0000000
--- a/web/html/network/monitoring/notifications/contact_methods/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
-PerlSetVar user_context monitoring_admin
commit 29421b0910bc2dacc409c3d2114025c95f40e4ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:57:56 2009 +0100
notifications/contact_methods/header.pxi not referenced from anywhere, removing.
diff --git a/web/html/network/monitoring/notifications/contact_methods/header.pxi b/web/html/network/monitoring/notifications/contact_methods/header.pxi
deleted file mode 100644
index 69f64ab..0000000
--- a/web/html/network/monitoring/notifications/contact_methods/header.pxi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::HTML" />
-
-<pxt-formvar>
- <rhn-toolbar base="h1" img="/img/rhn-icon-users.gif" help-url="">User: <rhn-user-login /></rhn-toolbar>
-</pxt-formvar>
-
-</pxt-passthrough>
13 years, 5 months
14 commits - web/html web/modules
by Jan Pazdziora
web/html/network/account/activation_keys/.htaccess | 20 --
web/html/network/account/activation_keys/packages.pxt | 31 ---
web/html/network/components/address_list.pxi | 16 --
web/html/network/errata/manage/errata_cache_update.pxi | 17 --
web/modules/rhn/RHN/DB/Package.pm | 8 -
web/modules/rhn/RHN/DB/Token.pm | 135 -----------------
web/modules/sniglets/Sniglets/ActivationKeys.pm | 51 ------
web/modules/sniglets/Sniglets/ErrataEditor.pm | 25 ---
web/modules/sniglets/Sniglets/Users.pm | 73 ---------
9 files changed, 376 deletions(-)
New commits:
commit 8601c1bb452b92016bc11bee34b5830b60453d3d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:48:39 2009 +0100
Removal of errata_cache_update.pxi made rhn-if-errata-package-list-modified and if_errata_package_list_modified not used, removing.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 8d91682..bf12bc3 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -28,8 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-if-errata-package-list-modified' => \&if_errata_package_list_modified);
-
$pxt->register_tag('rhn-if-var' => \&if_var, -5);
$pxt->register_tag('rhn-unless-var' => \&unless_var, -5);
}
@@ -87,27 +85,4 @@ sub unless_var {
}
-sub if_errata_package_list_modified {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $eid = $pxt->param('eid');
- return unless $eid;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- return if $errata->isa('RHN::DB::ErrataTmp'); #don't cache temp errata!
-
- my $package_list_edited = $pxt->session->get('errata_package_list_edited');
- my $edited = $package_list_edited->{$eid} || 0;
-
- if ((time - $edited) < 3600) {
- return $block;
- }
-
- return '';
-}
-
1;
commit 6732ea153fee095a909e85b767ef9dcdf7fb9fb3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:47:31 2009 +0100
errata/manage/errata_cache_update.pxi not used from anywhere, removing.
diff --git a/web/html/network/errata/manage/errata_cache_update.pxi b/web/html/network/errata/manage/errata_cache_update.pxi
deleted file mode 100644
index a8ffb3e..0000000
--- a/web/html/network/errata/manage/errata_cache_update.pxi
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- <pxt-use class="Sniglets::ErrataEditor" />
-
-<rhn-if-errata-package-list-modified>
- <div class="page-summary">
-<pxt-formvar>
- <span style="color: green">
- <p>The list of packages associated with this errata has been modified recently.</p>
- <p>These changes will not immediately be available to systems to which this errata applies. The changes will become available approximately 10 minutes after they are made. Or, you can <a href="/network/errata/manage/edit.pxt?pxt:trap=rhn:update_errata_cache&eid={formvar:eid}">commit your changes immediately</a> when you are finished editing this errata.</p>
- </span>
-</pxt-formvar>
- </div>
-</rhn-if-errata-package-list-modified>
-
-</pxt-passthrough>
\ No newline at end of file
commit 840c06c508e0c890e20b5432023b0f7f22e45bf8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:43:13 2009 +0100
Removal of address_list.pxi made rhn-user-site-view and user_site_view unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 4bc7c62..9fbcd13 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -59,8 +59,6 @@ sub register_tags {
$pxt->register_tag('rhn-require' => \&rhn_require, -1000);
- $pxt->register_tag('rhn-user-site-view' => \&user_site_view);
-
$pxt->register_tag('rhn-user-login' => \&rhn_user_login);
}
@@ -369,77 +367,6 @@ sub rhn_login_cb {
}
-sub user_site_view {
- my $pxt = shift;
- my %params = @_;
-
- my $uid = $pxt->param('uid') || $pxt->pnotes('uid') || $pxt->user->id;
- my $user = RHN::User->lookup(-id => $uid);
-
- die "no user" unless $user;
-
- if ($pxt->user->org_id != $user->org_id) {
- Carp::cluck "Orgs for admin user edit mistatch (admin: @{[$pxt->user->org_id]} != @{[$user->org_id]}";
- $pxt->redirect("/errors/permission.pxt");
- }
-
- if ($uid != $pxt->user->id and not $pxt->user->is('org_admin')) {
- Carp::cluck "Non-orgadmin attempting to edit another's record";
- $pxt->redirect("/errors/permission.pxt");
- }
-
- $pxt->pnotes(user_name => $user->login);
-
- my $type = uc $params{type} || $pxt->dirty_param('type') || $pxt->pnotes('type') || 'M';
- my $block = $params{__block__};
- my ($site) = $user->sites($type);
-
- unless ($site && $site->site_city && $site->site_state && $site->site_zip) {
- #($site) = $user->sites('M');
- my $link = PXT::HTML->link("edit_address.pxt?type=$type&uid=$uid", 'Add this address');
- my $html = qq(<div>\n<strong>(Address not filled out)</strong></div>);
- $html .= qq(<div>\n$link\n</div>\n);
-
- return $html;
- }
-
- if ($user->id == $pxt->user->id) {
- if ($type eq 'M' and $pxt->uri =~ m(/network/account/edit_address.pxt) and $site and ($site->site_city eq '.' or $site->site_address1 eq '.')) {
- $pxt->push_message(site_info => 'Please take a moment and complete the information below for our records.');
-
- $site->$_('')
- foreach qw/site_address1 site_address2 site_address3 site_city site_state site_zip site_fax site_phone/;
- }
- }
-
- my %subst;
-
- my $site_addr = '';
- $site_addr .= $site->$_() ? PXT::Utils->escapeHTML($site->$_()) . '<br />' : ''
- foreach qw/site_address1 site_address2 site_address3/;
-
- $subst{site_address} = $site_addr;
-
- my $site_city = $site->site_city() || '';
- my $site_state = $site->site_state() || '';
- my $site_zip = $site->site_zip() || '';
-
- my $site_city_state_zip = $site_city ne '' ? "$site_city, $site_state" : $site_state;
- $site_city_state_zip .= $site_zip ? " $site_zip" : '';
-
- $subst{site_city_state_zip} = PXT::Utils->escapeHTML($site_city_state_zip);
-
- $subst{user_id} = $user->id;
-
- $subst{site_type} = $type;
-
- $subst{$_} = $site->$_() ? PXT::Utils->escapeHTML($site->$_()) || '' : ''
- foreach qw/site_phone site_fax/;
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-
sub user_prefs_edit_cb {
my $pxt = shift;
commit 30dadc516f2819fcab6a8803e05f112297932845
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:41:29 2009 +0100
address_list.pxi not used anywhere, removing.
diff --git a/web/html/network/components/address_list.pxi b/web/html/network/components/address_list.pxi
deleted file mode 100644
index b2f2c11..0000000
--- a/web/html/network/components/address_list.pxi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::HTML" />
-
-<rhn-user-site-view>
- <div>{site_address} {site_city_state_zip}</div>
- <div>Phone: {site_phone}</div>
- <div>Fax: {site_fax}</div>
- <div>
- <a href="edit_address.pxt?type={site_type}&uid={user_id}">Edit this address</a>
- </div>
-</rhn-user-site-view>
-
-</pxt-passthrough>
-
commit ab2dbe8765c937777c4360968774379a4d28690e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:38:44 2009 +0100
Removal of clone_token made set_config_channels not used, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 591316e..96cf778 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -165,40 +165,6 @@ sub fancy_packages {
return @$data;
}
-sub set_config_channels {
- my $self = shift;
- my @config_channels = @_;
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- $query = <<EOQ;
-DELETE FROM rhnRegTokenConfigChannels RTCC
- WHERE RTCC.token_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $query = <<EOQ;
-INSERT INTO rhnRegTokenConfigChannels
- (token_id, config_channel_id, position)
- VALUES (?, ?, ?)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- my $counter = 1;
- foreach my $ns_id (@config_channels) {
- $sth->execute($self->id, $ns_id, $counter);
- $counter++;
- }
-
- $sth->finish;
- $dbh->commit;
-}
-
sub groups {
my $self = shift;
commit 86856884df032fbea76a51db6faff6e7c9f5a190
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:38:15 2009 +0100
Removal of clone_token made set_groups not used, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index fc94b56..591316e 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -267,38 +267,6 @@ EOQ
return;
}
-sub set_groups {
- my $self = shift;
- my @groups = @_;
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- $query = <<EOQ;
-DELETE FROM rhnRegTokenGroups RTG
- WHERE RTG.token_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $query = <<EOQ;
-INSERT INTO rhnRegTokenGroups
- (token_id, server_group_id)
- VALUES (?, ?)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- foreach my $group (@groups) {
- $sth->execute($self->id, $group);
- }
-
- $sth->finish;
- $dbh->commit;
-}
-
sub lookup {
my $class = shift;
my %params = validate(@_, { id => 0, sid => 0, token => 0 });
commit 70f05c317789f5d3ba16dc060af6aa1e4ccd1dc9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:36:44 2009 +0100
Removal of clone_token made create_new_key not used, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index cdb05ee..fc94b56 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -625,18 +625,4 @@ sub org_default {
return $hit ? 1 : 0;
}
-sub create_new_key {
- my $self = shift;
-
- my $new_key = $self->generate_random_key;
-
- while (my $existing = RHN::Token->lookup(-token => $new_key)) {
- $new_key = $self->generate_random_key;
- }
-
- $self->activation_key_token($new_key);
-
- return $new_key;
-}
-
1;
commit d34fbc4be233742d5099598922c75f8f9e375e1f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:34:37 2009 +0100
Removal of edit_token_packages_cb and clone_token makes set_packages unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 9f03293..cdb05ee 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -199,39 +199,6 @@ EOQ
$dbh->commit;
}
-sub set_packages {
- my $self = shift;
- my @packages = @_;
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- $query = <<EOQ;
-DELETE FROM rhnRegTokenPackages RTP
- WHERE RTP.token_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $query = <<EOQ;
-INSERT INTO rhnRegTokenPackages
- (token_id, name_id)
- VALUES (?, ?)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- foreach my $pid (@packages) {
- next unless $pid;
- $sth->execute($self->id, $pid);
- }
-
- $sth->finish;
- $dbh->commit;
-}
-
sub groups {
my $self = shift;
commit bf30b4c8c5d72b273806a1a30bf1bab105007ab4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:33:47 2009 +0100
clone_token is not used anywhere, removing.
diff --git a/web/modules/rhn/RHN/DB/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 5df8b21..9f03293 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.pm
@@ -672,26 +672,4 @@ sub create_new_key {
return $new_key;
}
-sub clone_token {
- my $self = shift;
-
- my $other = RHN::Token->create_token;
-
- foreach my $field ($t->method_names, map { lc } @ak_fields) {
- next if ($field eq 'id');
- $other->$field($self->$field);
- }
-
- $other->create_new_key;
-
- $other->commit;
-
- $other->set_channels(-channels => [ $self->channels ]);
- $other->set_groups($self->groups);
- $other->set_config_channels($self->config_channels);
- $other->set_packages($self->packages);
-
- return $other;
-}
-
1;
commit 5f4d33db7f9bb19753d38963cbba03329569665b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:32:52 2009 +0100
Removal of edit_token_packages_cb makes lookup_package_name_id unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index ed7f33d..52d92e8 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -1400,14 +1400,6 @@ EOQ
}
-sub lookup_package_name_id {
- my $class = shift;
- my $name = shift;
-
- my $dbh = RHN::DB->connect;
- return $dbh->call_function('lookup_package_name', $name);
-}
-
sub is_package_in_channel {
my $class = shift;
my %params = validate(@_, { evr_id => 0, name_id => 0, id => 0, cid => 1 });
commit 3c267c4837fc23ca73e312e27a44c6e011e83576
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:32:08 2009 +0100
Removal of packages.pxt makes rhn:edit_token_packages_cb and edit_token_packages_cb unused, removing.
diff --git a/web/modules/sniglets/Sniglets/ActivationKeys.pm b/web/modules/sniglets/Sniglets/ActivationKeys.pm
index 6b2d5fe..076ae95 100644
--- a/web/modules/sniglets/Sniglets/ActivationKeys.pm
+++ b/web/modules/sniglets/Sniglets/ActivationKeys.pm
@@ -43,7 +43,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
$pxt->register_callback('rhn:edit_token_channels_cb' => \&edit_token_channels_cb);
- $pxt->register_callback('rhn:edit_token_packages_cb' => \&edit_token_packages_cb);
}
@@ -154,37 +153,6 @@ sub create_token {
return $token;
}
-sub edit_token_packages_cb {
- my $pxt = shift;
-
- my $tid = $pxt->param('tid');
- my $token = RHN::Token->lookup(-id => $tid);
-
- my $pkg_string = $pxt->dirty_param('packages');
- $pkg_string =~ s(\r)()g;
- # remove whitespace from beginning and end
- $pkg_string =~ s/^\s+//;
- $pkg_string =~ s/\s+$//;
- my @package_names = split /\n+/, $pkg_string;
-
- my %seen;
- my @packages;
- for my $name (@package_names) {
- if (exists $seen{$name}) {
- $pxt->push_message(local_alert => "Package '$name' appears multiple times.");
- return;
- }
- $seen{$name}++;
-
- my $pkg_id = RHN::Package->lookup_package_name_id($name);
-
- push @packages, $pkg_id;
- }
-
- $token->set_packages(@packages);
- $pxt->push_message(site_info => sprintf('Activation Key <strong>%s</strong> has been modified.', PXT::Utils->escapeHTML($token->note)));
-}
-
sub token_details {
my $pxt = shift;
my %attr = @_;
commit 9f5cef94d28275e1c27f62873f2ee4b20d20162c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:30:08 2009 +0100
Removal of packages.pxt makes rhn-token-packages and edit_token_packages unused, removing.
diff --git a/web/modules/sniglets/Sniglets/ActivationKeys.pm b/web/modules/sniglets/Sniglets/ActivationKeys.pm
index b046955..6b2d5fe 100644
--- a/web/modules/sniglets/Sniglets/ActivationKeys.pm
+++ b/web/modules/sniglets/Sniglets/ActivationKeys.pm
@@ -37,7 +37,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag('rhn-token-details' => \&token_details);
$pxt->register_tag('rhn-token-channels' => \&edit_token_channels);
- $pxt->register_tag('rhn-token-packages' => \&edit_token_packages);
}
sub register_callbacks {
@@ -155,24 +154,6 @@ sub create_token {
return $token;
}
-sub edit_token_packages {
- my $pxt = shift;
-
- my $tid = $pxt->param('tid');
- my $token = RHN::Token->lookup(-id => $tid);
-
- my @packages = $token->fancy_packages;
- my $pkg_count = scalar @packages;
- my $pkg_string = join("\n", map { $_->{NAME} } @packages);
-
- my $widget = new RHN::Form::Widget::TextArea(name => 'Packages',
- label => 'packages',
- cols => 64,
- rows => $pkg_count < 4 ? 6 : $pkg_count + 1,
- default => ($pkg_string || ''));
- return $widget->render;
-}
-
sub edit_token_packages_cb {
my $pxt = shift;
commit 5770b1b790ff67400b7071ae527b56049d07f6bb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:27:31 2009 +0100
The file namespaces.pxt does not exist, no need to have it in .htaccess, removing.
diff --git a/web/html/network/account/activation_keys/.htaccess b/web/html/network/account/activation_keys/.htaccess
index e06c00e..cabe5cd 100644
--- a/web/html/network/account/activation_keys/.htaccess
+++ b/web/html/network/account/activation_keys/.htaccess
@@ -8,13 +8,3 @@ require acl user_role(activation_key_admin); org_entitlement(sw_mgr_enterprise)
-<Files namespaces.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
commit b73dfc725d0a37d1df471ebb2c083cea5d0ec901
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:26:19 2009 +0100
activation_keys/packages.pxt not referenced from anywhere, replaced by activationkeys/packages/Packages.do, removing.
diff --git a/web/html/network/account/activation_keys/.htaccess b/web/html/network/account/activation_keys/.htaccess
index a57bf0d..e06c00e 100644
--- a/web/html/network/account/activation_keys/.htaccess
+++ b/web/html/network/account/activation_keys/.htaccess
@@ -8,16 +8,6 @@ require acl user_role(activation_key_admin); org_entitlement(sw_mgr_enterprise)
-<Files packages.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl org_entitlement(rhn_provisioning)
-</Files>
-
<Files namespaces.pxt>
AuthType Basic
AuthName "RHN Org Admin Area"
diff --git a/web/html/network/account/activation_keys/packages.pxt b/web/html/network/account/activation_keys/packages.pxt
deleted file mode 100644
index e6f7ea4..0000000
--- a/web/html/network/account/activation_keys/packages.pxt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::ActivationKeys" />
- <pxt-use class="Sniglets::Lists" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <pxt-include file="top.pxi" />
-
-<div class="page-summary">
- <p>Any system registered with this activation key will have the following packages installed, if those packages are available. List packages by name only, one per line.</p>
-</div>
-
- <h2>Enter package names below</h2>
- <pxt-form method="post" name="edit_token_packages">
- <rhn-token-packages />
-
- <input type="hidden" name="pxt:trap" value="rhn:edit_token_packages_cb" />
-
- <div align="right">
- <hr />
- <input type="submit" name="Update Key" value="Update Key" />
- </div>
-
- <pxt-hidden name="tid" />
- </pxt-form>
-
- </grail-canvas-template>
-</pxt-passthrough>
13 years, 5 months
Changes to 'refs/tags/spacewalk-web-0.8.5-1'
by Jan Pazdziora
Tag 'spacewalk-web-0.8.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-12-26 19:09 +0000
Tagging package [spacewalk-web] version [0.8.5-1] in directory [web/].
Changes since spacewalk-web-0.8.4-1:
Jan Pazdziora (20):
all_channels.pxt is not referenced from anywhere, removing.
retired_channels.pxt is not referenced from anywhere, removing.
download-expired.pxt is not referenced from anywhere, removing.
download-mismatch.pxt is not referenced from anywhere, removing.
installed_systems.pxt is not referenced from anywhere, removing.
Removal of schedule_kickstart_cb made missing_packages.pxt unreferenced, removing.
verify_system_list.pxt is not referenced from anywhere, removing.
preservation_list.pxt is not referenced from anywhere, removing.
preservation/edit.pxt and preservation/delete.pxt are not referenced either, removing whole dir.
/network/systems/provisioning/sessions not referenced from anywhere (besides kickstart_session_detail.xml), removing.
After both preservation and sessions is gone from provisioning, it is no longer needed, removing.
newlogin/common.pxi is not referenced from anywhere, removing.
legends/probes-list-legend.pxi is not referenced from anywhere, removing.
monitoring/probe_state_summary.pxi is not referenced from anywhere, removing.
network/components/ts_and_cs.pxi is not referenced from anywhere, removing.
systems/system_list.pxi is not referenced from anywhere, removing.
system_group_list.pxi and system-group-list-legend.pxi is not referenced from anywhere, removing.
Mention removal of the spacewalk-moon subpackage in the %changelog.
Remove the RHN::TextMessage source.
Automatic commit of package [spacewalk-web] release [0.8.5-1].
Justin Sherrill (1):
526823 - improving speed of scheduling package installs for 1000s of systems
Tomas Lestach (1):
channel checksum changes
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 55 ++---
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 8
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java | 4
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 2
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 5
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 2
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 4
rel-eng/packages/spacewalk-web | 2
web/html/errors/download-expired.pxt | 18 -
web/html/errors/download-mismatch.pxt | 18 -
web/html/nav/kickstart_session_detail.xml | 10 -
web/html/nav/sitenav-authenticated.xml | 4
web/html/network/components/legends/probes-list-legend.pxi | 18 -
web/html/network/components/legends/system-group-list-legend.pxi | 10 -
web/html/network/components/monitoring/probe_state_summary.pxi | 8
web/html/network/components/newlogin/common.pxi | 76 --------
web/html/network/components/system_groups/system_group_list.pxi | 28 --
web/html/network/components/systems/system_list.pxi | 32 ---
web/html/network/components/ts_and_cs.pxi | 94 ----------
web/html/network/software/all_channels.pxt | 35 ---
web/html/network/software/retired_channels.pxt | 36 ---
web/html/network/systems/details/kickstart/missing_packages.pxt | 57 ------
web/html/network/systems/provisioning/.htaccess | 8
web/html/network/systems/provisioning/preservation/delete.pxt | 47 -----
web/html/network/systems/provisioning/preservation/edit.pxt | 67 -------
web/html/network/systems/provisioning/preservation/preservation_list.pxt | 29 ---
web/html/network/systems/provisioning/sessions/.htaccess | 9
web/html/network/systems/provisioning/sessions/cancel_session.pxt | 46 ----
web/html/network/systems/provisioning/sessions/details.pxt | 63 ------
web/html/network/systems/provisioning/sessions/history.pxt | 31 ---
web/html/network/systems/provisioning/sessions/session_details_header.pxi | 16 -
web/html/network/systems/ssm/packages/installed_systems.pxt | 27 --
web/html/network/systems/ssm/packages/verify_system_list.pxt | 27 --
web/modules/rhn/RHN/TextMessage.pm | 24 --
web/spacewalk-web.spec | 7
38 files changed, 50 insertions(+), 887 deletions(-)
---
13 years, 5 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/TextMessage.pm | 24 ------------------------
web/spacewalk-web.spec | 5 ++++-
3 files changed, 5 insertions(+), 26 deletions(-)
New commits:
commit 21b214c1ac79573eb9e9c62baf20f27ecbff81b0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:09:34 2009 +0100
Automatic commit of package [spacewalk-web] release [0.8.5-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8c42e6d..8e2349d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.8.4-1 web/
+0.8.5-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 6cca872..d20120e 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -277,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Sat Dec 26 2009 Jan Pazdziora 0.8.5-1
+- more dead code removals
+
* Tue Dec 22 2009 Jan Pazdziora 0.8.4-1
- Removed more dead code, including spacewalk-cypress.
commit 2a43977ef2a94cad98acd3fba952a73c11540614
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Sat Dec 26 20:07:37 2009 +0100
Remove the RHN::TextMessage source.
diff --git a/web/modules/rhn/RHN/TextMessage.pm b/web/modules/rhn/RHN/TextMessage.pm
deleted file mode 100644
index 8b5d8da..0000000
--- a/web/modules/rhn/RHN/TextMessage.pm
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-package RHN::TextMessage;
-
-use strict;
-use RHN::DB::Message::TextMessage;
-
-our @ISA = qw/RHN::DB::Message::TextMessage/;
-
-
-1;
13 years, 5 months
web/spacewalk-web.spec
by Jan Pazdziora
web/spacewalk-web.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 86151c22fe2eb91c3fabbca50474c114ba2484e8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Dec 24 20:57:40 2009 +0100
Mention removal of the spacewalk-moon subpackage in the %changelog.
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 56ef35d..6cca872 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -281,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT
- Removed more dead code, including spacewalk-cypress.
* Mon Dec 21 2009 Jan Pazdziora <jpazdziora(a)redhat.com> 0.8.3-1
-- removed a lot of dead code
+- removed a lot of dead code, including spacewalk-moon
- modified to fit sha256 schema changes (michael.mraka(a)redhat.com)
- adding channel.software.regenerateYumCache() api call (jsherril(a)redhat.com)
13 years, 5 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 55 ++++------
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 8 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java | 4
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 2
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 5
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 2
8 files changed, 40 insertions(+), 42 deletions(-)
New commits:
commit 08ce8d435c613beaf6555abf27a83088d36006ad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 23 15:22:21 2009 +0100
channel checksum changes
changed logic of Channel.getChecksumType()/Channel.getChecksumTypeLabel()
renamed some checksum stuff
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 02ea23e..4f19ef5 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -46,7 +46,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
column="channel_arch_id"/>
<many-to-one
- name="checksum"
+ name="checksumType"
class="com.redhat.rhn.domain.common.ChecksumType"
column="checksum_type_id"/>
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index 27267cc..8d8872f 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -65,7 +65,7 @@ public class Channel extends BaseDomainHelper implements Comparable {
.asList("5Server", "5Client"));
private String baseDir;
private ChannelArch channelArch;
- private ChecksumType checksum;
+ private ChecksumType checksumType;
private String description;
private Date endOfLife;
@@ -169,15 +169,15 @@ public class Channel extends BaseDomainHelper implements Comparable {
/**
* @return Returns the channelChecksum.
*/
- public ChecksumType getChecksum() {
- return checksum;
+ public ChecksumType getChecksumType() {
+ return checksumType;
}
/**
- * @param checksumIn The checksum to set.
+ * @param checksumTypeIn The checksum to set.
*/
- public void setChecksum(ChecksumType checksumIn) {
- this.checksum = checksumIn;
+ public void setChecksumType(ChecksumType checksumTypeIn) {
+ this.checksumType = checksumTypeIn;
}
@@ -880,35 +880,34 @@ public class Channel extends BaseDomainHelper implements Comparable {
* If its RHEL-5 we use sha1 anything newer will be sha256.
* @return checksumType
*/
- public String getChecksumType() {
- Channel toConsider = this;
+ public String getChecksumTypeLabel() {
- while (toConsider.getParentChannel() != null) {
- toConsider = toConsider.getParentChannel();
+ if ((checksumType != null) && (checksumType.getLabel() != null)) {
+ return checksumType.getLabel();
}
- DistChannelMap channelDist = ChannelFactory.lookupDistChannelMap(toConsider);
+
+ Channel parent = this.getParentChannel();
+ if (parent != null) {
+ String parentChecksumType = parent.getChecksumTypeLabel();
+ if (parentChecksumType != null) {
+ setChecksumType(
+ ChannelFactory.findChecksumTypeByLabel(parentChecksumType));
+ return parentChecksumType;
+ }
+ }
+
+ DistChannelMap channelDist = ChannelFactory.lookupDistChannelMap(this);
if (channelDist != null) {
String release = channelDist.getRelease();
- // If channel or parent is RHEL-5 use sha1, else use sha256
+ // If channel or parent is RHEL-5 use sha1
if (sha1compatiblechannels.contains(release)) {
+ this.setChecksumType(
+ ChannelFactory.findChecksumTypeByLabel(CHECKSUM_SHA_1));
return CHECKSUM_SHA_1;
}
}
-
- // IF its custom use the one set at channel creation time
-
- if (toConsider.isCustom()) {
- ChecksumType checksumOut = toConsider.getChecksum();
- if ((checksumOut != null) && (checksumOut.getLabel() != null)) {
- return checksumOut.getLabel();
- }
- else {
- // default to sha1 if its not available in the db
- return CHECKSUM_SHA_1;
- }
- }
-
- // default to sha256
- return CHECKSUM_SHA_256;
+
+ // sorry, but something's really wrong
+ return null;
}
}
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
index 35381db..096d9fb 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
@@ -50,12 +50,12 @@ public class ClonedChannel extends Channel {
* {@inheritDoc}
*/
@Override
- public ChecksumType getChecksum() {
- if (super.getChecksum() == null) {
+ public ChecksumType getChecksumType() {
+ if (super.getChecksumType() == null) {
// if the checksum type is not set use the
//checksum of original channel instead.
- setChecksum(getOriginal().getChecksum());
+ setChecksumType(getOriginal().getChecksumType());
}
- return super.getChecksum();
+ return super.getChecksumType();
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index c0aaf2b..f5078c3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -568,11 +568,11 @@ public class EditChannelAction extends RhnAction implements Listable {
form.set("maintainer_phone", c.getMaintainerPhone());
form.set("maintainer_email", c.getMaintainerEmail());
form.set("support_policy", c.getSupportPolicy());
- if (c.getChecksum() == null) {
+ if (c.getChecksumTypeLabel() == null) {
form.set("checksum", null);
}
else {
- form.set("checksum", c.getChecksum().getLabel());
+ form.set("checksum", c.getChecksumTypeLabel());
}
if (c.isGloballySubscribable(ctx.getLoggedInUser().getOrg())) {
form.set("per_user_subscriptions", "all");
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
index bc71360..34444a8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
@@ -511,7 +511,7 @@ public class ChannelSoftwareHandlerTest extends BaseHandlerTestCase {
assertNotNull(ca);
assertNotNull(c.getChannelArch());
assertEquals(ca.getLabel(), c.getChannelArch().getLabel());
- assertEquals(c.getChecksumType(), "sha1");
+ assertEquals(c.getChecksumTypeLabel(), "sha1");
}
public void testCreateWithChecksum() throws Exception {
@@ -529,7 +529,7 @@ public class ChannelSoftwareHandlerTest extends BaseHandlerTestCase {
assertNotNull(ca);
assertNotNull(c.getChannelArch());
assertEquals(ca.getLabel(), c.getChannelArch().getLabel());
- assertEquals(c.getChecksumType(), "sha256");
+ assertEquals(c.getChecksumTypeLabel(), "sha256");
}
public void testCreateUnauthUser() {
diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
index 5564a40..3f1e665 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
@@ -271,7 +271,7 @@ public class CreateChannelCommand {
c.setOrg(user.getOrg());
c.setBaseDir("/dev/null");
c.setChannelArch(ca);
- c.setChecksum(ct);
+ c.setChecksumType(ct);
c.setGPGKeyId(gpgKeyId);
c.setGPGKeyUrl(gpgKeyUrl);
c.setGPGKeyFp(gpgKeyFp);
diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
index aabdbb2..917b98a 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
@@ -68,8 +68,7 @@ public class UpdateChannelCommand extends CreateChannelCommand {
}
ChecksumType ct = ChannelFactory.findChecksumTypeByLabel(checksum);
-
- if (!ct.getLabel().equals(c.getChecksum().getLabel()) && c.getPackageCount() > 0) {
+ if (!ct.getLabel().equals(c.getChecksumTypeLabel()) && c.getPackageCount() > 0) {
// schedule repo re generation if the checksum type changed
// and the channel has packages
ChannelManager.queueChannelChange(c.getLabel(),
@@ -84,7 +83,7 @@ public class UpdateChannelCommand extends CreateChannelCommand {
c.setGPGKeyId(gpgKeyId);
c.setGPGKeyUrl(gpgKeyUrl);
c.setGPGKeyFp(gpgKeyFp);
- c.setChecksum(ct);
+ c.setChecksumType(ct);
c.setAccess(access);
c.setMaintainerName(maintainerName);
c.setMaintainerEmail(maintainerEmail);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index 9b52cd5..469f979 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -104,7 +104,7 @@ public class RepositoryWriter {
CompressingDigestOutputWriter otherFile;
// Get compatible checksumType
- this.checksumtype = channel.getChecksumType();
+ this.checksumtype = channel.getChecksumTypeLabel();
log.info("Checksum Type Value" + this.checksumtype);
13 years, 5 months
6 commits - web/html
by Jan Pazdziora
web/html/network/components/legends/probes-list-legend.pxi | 18 -
web/html/network/components/legends/system-group-list-legend.pxi | 10 -
web/html/network/components/monitoring/probe_state_summary.pxi | 8
web/html/network/components/newlogin/common.pxi | 76 --------
web/html/network/components/system_groups/system_group_list.pxi | 28 --
web/html/network/components/systems/system_list.pxi | 32 ---
web/html/network/components/ts_and_cs.pxi | 94 ----------
7 files changed, 266 deletions(-)
New commits:
commit 8d81aa6835885aff5e79b4e4bc2e394136825ce1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:20:12 2009 +0100
system_group_list.pxi and system-group-list-legend.pxi is not referenced from anywhere, removing.
diff --git a/web/html/network/components/legends/system-group-list-legend.pxi b/web/html/network/components/legends/system-group-list-legend.pxi
deleted file mode 100644
index 003250c..0000000
--- a/web/html/network/components/legends/system-group-list-legend.pxi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>System Group Legend</h2>
- <ul>
- <li><img src="/img/icon_up2date.gif" alt="" />OK</li>
- <li><img src="/img/icon_crit_update.gif" alt="" />Critical</li>
- <li><img src="/img/icon_reg_update.gif" alt="" />Warning</li>
- </ul>
-</div>
diff --git a/web/html/network/components/system_groups/system_group_list.pxi b/web/html/network/components/system_groups/system_group_list.pxi
deleted file mode 100644
index 7e75b14..0000000
--- a/web/html/network/components/system_groups/system_group_list.pxi
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<pxt-passthrough>
-
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::Users" />
-
-<rhn-listview class="Sniglets::ListView::SystemGroupList" mode="visible_to_user">
-
-
- <column name="Updates" label="status_icon" align="center" width="5%">
- <url>/network/systems/groups/errata_list.pxt?sgid={column:id}</url>
- </column>
- <rhn-require acl="org_entitlement(rhn_monitor)">
- <column name="Health" label="monitoring_icon" align="center" width="1%" />
- </rhn-require>
- <column name="Group Name" label="group_name" width="50%" align="left">
- <url>/network/systems/groups/details.pxt?sgid={column:id}</url>
- </column>
- <column name="Systems" label="server_count" width="1%" align="center">
- <url>/network/systems/groups/system_list.pxt?sgid={column:id}</url>
- </column>
- <column name="Use in SSM" label="work_with_group" width="1%" align="center" />
-
-
-</rhn-listview>
-
-</pxt-passthrough>
commit 6b0cfe0d5f8d45c042db68b6fa41e9693e4b9f57
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:18:58 2009 +0100
systems/system_list.pxi is not referenced from anywhere, removing.
diff --git a/web/html/network/components/systems/system_list.pxi b/web/html/network/components/systems/system_list.pxi
deleted file mode 100644
index 92bf034..0000000
--- a/web/html/network/components/systems/system_list.pxi
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
-<pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::Users" />
-
-<rhn-listview class="Sniglets::ListView::SystemList" mode="visible_to_user" alphabar_column="name">
-
- <set name="users selected systems" label="system_list" />
-
- <column name="Updates" label="advisory_icon" align="center" width="5%" />
-
- <rhn-require acl="org_entitlement(rhn_monitor)">
- <column name="Health" label="monitoring_icon" align="center" width="5%" />
- </rhn-require>
-
- <column name="Errata" label="total_errata" align="center" width="5%">
- <url>/network/systems/details/errata_list.pxt?sid={column:id}</url>
- </column>
- <column name="Packages" label="outdated_packages" align="center" width="5%">
- <url>/network/systems/details/packages/upgrade.pxt?sid={column:id}</url>
- </column>
- <column name="System" label="server_name" sort_by="1" align="left" width="35%">
- <url>/rhn/systems/details/Overview.do?sid={column:id}</url>
- </column>
- <column name="Base Channel" label="channel_labels" align="left" />
-
- <column name="Entitlement" label="entitlement_level" width="5%"/>
-
-</rhn-listview>
-
-</pxt-passthrough>
commit 05eb6508861c8d35d4cc9960a1339936d2541834
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:17:43 2009 +0100
network/components/ts_and_cs.pxi is not referenced from anywhere, removing.
diff --git a/web/html/network/components/ts_and_cs.pxi b/web/html/network/components/ts_and_cs.pxi
deleted file mode 100644
index 91c3a57..0000000
--- a/web/html/network/components/ts_and_cs.pxi
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-<h1><img src="/img/rhn-icon-info.gif" /> Red Hat Network Services<br />
-Use and Subscription Agreement</h1>
-
-<p>Red Hat Network is an Internet solution for managing one or more Red Hat Linux or Red Hat Enterprise Linux systems (the "Service"). This Red Hat Network Use and Subscription Agreement (the "Agreement") is between Red Hat, Inc. ("Red Hat") and all users of, and subcribers to, the Service ("you" or "Customer"). The Effective Date of this Agreement is the earlier of the date that the Customer accepts this Agreement or the date that the Customer uses the Service.</p>
-
-<p>PLEASE READ THIS AGREEMENT CAREFULLY BEFORE USING OR SUBSCRIBING TO THE SERVICE OR PROFILING, REGISTERING OR ENTITLING A SYSTEM WITH THE SERVICE. BY USING OR SUBSCRIBING TO THE SERVICE, OR BY PROFILING, REGISTERING OR ENTITLING A SYSTEM WITH THE SERVICE, YOU SIGNIFY YOUR ASSENT TO THIS AGREEMENT. IF YOU ARE ACTING ON BEHALF OF AN ENTITY, THEN YOU REPRESENT THAT YOU HAVE THE AUTHORITY TO ENTER INTO THIS AGREEMENT ON BEHALF OF THAT ENTITY. IF YOU DO NOT ACCEPT THE TERMS OF THIS AGREEMENT, THEN PLEASE DO NOT ACCESS, USE OR SUBSCRIBE TO THE SERVICE AND DO NOT PROFILE, REGISTER OR ENTITLE A SYSTEM WITH OR FOR THE SERVICE.</p>
-
-<p><strong>1. Use and Subscription Conditions</strong></p>
-
-<p>You must be at least thirteen (13) years old to use, or entitle a system with, the Service.</p>
-
-<p>You are responsible for securing Internet access to use the Service.</p>
-
-<p>You must provide a valid, unique email address to Red Hat for each account designation.</p>
-
-<p>Red Hat reserves the right to modify the Service at any time and for any reason or no reason.</p>
-
-<p><strong>2. Password and Security</strong></p>
-
-<p>Customer will create a username, password, and account designation at the time Customer subscribes for Service. It is the Customer's duty to keep this user information confidential. Customer must notify Red Hat immediately upon discovering any unauthorized use of Customer's account. Customer must have a subscription for a system to entitle such system to receive Service. The Service may be used only for the benefit of the Customer and only for the systems with subscriptions. Customer may not use one subscription for Services for more than one system concurrently. Any unauthorized use of the Service will be deemed to be a material breach of this Agreement.</p>
-
-<p><strong>3. End User License Agreement</strong></p>
-
-<p>All of the software programs provided by means of the Red Hat Network (the
-"Software Programs") are individually written and copyrighted, and are subject
-to individual end user license agreements (each, a "EULA") that are applicable
-to the Software Programs. These EULAs are located in the source code to the software programs.
-You agree to review, and that you are subject to,
-each such EULA. Most of the EULAs permit you to copy, modify and redistribute
-the Software Programs, in both source code and binary code forms. Nothing in
-this Agreement limits your rights under, or grants you rights that supercede,
-any applicable EULA.</p>
-
-<p>The Software Programs provided by means of the Service, including source code, documentation, appearance, structure and organization are proprietary products of Red Hat and others and are protected by copyright and other laws. Title to these Software Programs, or to any copy, modification or merged portion of the Software Programs, shall at all times remain with the aforementioned, subject to the terms and conditions of the applicable EULA related to the Software Programs under consideration.</p>
-
-<p>The "Red Hat" trademark and Red Hat's "Shadowman Logo" are registered trademarks of Red Hat in the United States and other countries. You are not permitted to distribute the Software Programs utilizing Red Hat's trademarks.</p>
-
-<p><strong>4. Warranty and Limitation of Liability</strong></p>
-
-<p>Warranty</p>
-
-<p>Except as specifically stated in this Agreement, the Service and
-any Software Program provided by means of the Service are provided and
-licensed "AS IS" WITH OUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTY OF
-MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR
-PURPOSE. RED HAT DOES NOT GUARANTEE THAT THE USE OF SERVICE OR THE
-SOFTWARE PROGRAMS WILL NOT BE INTERRUPTED OR ERROR FREE. </p>
-
-<p>Limitation of Liability</p>
-
-<p>
-To the maximum extent permitted by applicable law, IN NO
-EVENT WILL RED HAT BE LIABLE TO YOU FOR ANY INCIDENTAL OR
-CONSEQUENTIAL DAMAGES, WHETHER IN TORT OR IN CONTRACT, INCLUDING LOST
-PROFITS, LOST SAVINGS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF (A) THE SERVICE, THE SOFTWARE PROGRAMS (B) ANY
-INTERRUPTION OF USE OF THE SERVICE OR THE SOFTWARE PROGRAMS OR (C) FOR
-LOSS, INACCURACY OR CORRUPTION OF DATA, EVEN IF RED HAT HAS BEEN
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. RED HAT'S LIABILITY UNDER
-THIS AGREEMENT SHALL BE LIMITED TO DIRECT DAMAGES NOT TO EXCEED THE
-AMOUNT THAT CUSTOMER PAID TO RED HAT FOR THE SERVICES FOR ONE YEAR.
-</p>
-
-<p><strong>5. Payment Obligations Applicable to Subscribers</strong></p>
-
-<p>If Customer has purchased a subscription to the Service, then Customer agrees to the following:</p>
-
-<p>All fees are stated, and must be paid in, United States Dollars. All fees are exclusive of any foreign, federal, state or local sales, excise, use or similar taxes. Customer agrees to pay all such taxes, when applicable, regardless of whether such taxes appear on an original invoice or are later levied (excluding any taxes levied solely on the income of Red Hat). Any renewal of this Agreement will be at Red Hat's list prices in effect at the time of the renewal. All payments are non-refundable.</p>
-
-<p>Customer agrees to provide Red Hat with accurate and complete billing information (including legal name, address, telephone number, and billing or credit information). Customer will report to Red Hat all changes to this information within thirty (30) days of the change. Customer shall direct any questions regarding its account to Red Hat's customer service department. All charges are considered valid unless disputed within sixty (60) days of the billing date. Adjustments will not be made for charges that are more than 60 days old. Red Hat reserves the right to suspend or cancel Service for non-payment. Red Hat is not responsible for Customer's credit card or debit card fees or expenses. In the event that the Service is purchased through a reseller rather than directly through Red Hat, the Customer's Service will be suspended if the reseller fails to pay all amounts due to Red Hat.</p>
-
-<p><strong>6. Term of this Agreement and Modification of Services.</strong></p>
-
-<p>PAID SUBSCRIPTIONS. For paid subscriptions to the Service, the initial term of this Agreement shall commence on the Effective Date and shall continue until April 30, 2004. </p>
-
-<p>DEMO SUBSCRIPTIONS. For demo subscriptions to the Service, this Agreement is effective for sixty (60) days from the Effective Date until terminated earlier by either party in accordance with this Agreement. Customer may terminate this Agreement at any time by providing notice of termination in writing to Red Hat online via Customer's Red Hat Network account.</p>
-
-<p>ALL SUBSCRIPTIONS. Red Hat may terminate this Agreement, use of the Service or password access to the Service at any time without prior notice, if Red Hat in its sole discretion determines that there has been a violation of this Agreement, applicable policies or failure to pay charges when due. Red Hat may terminate this Agreement at any time by providing notice of termination to you in any reasonable manner.</p>
-
-<p>Sections 3 through 7 of this Agreement shall survive any termination of this Agreement.</p>
-
-<p><strong>RED HAT RESERVES THE RIGHT TO MODIFY THE SERVICE AT ANY TIME AND FOR ANY REASON OR NO REASON.</strong></p>
-
-<p><strong>7. Export Compliance</strong></p>
-
-<p>Customer represents and warrants that it: (a) understands that certain of the Services are subject to export controls under the U.S. Commerce Department's Export Administration Regulations ("EAR"); (b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations (currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); (c) will not export, re-export, or transfer the Services to any prohibited destination, entity, or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; (d) will not use or transfer the Services for use in any sensitive nuclear, chemical or biological weapons, or missile technology end-uses unless authorized by the U.S. Government by regulation or specific license; (e) understands and agrees that if it is in the United States and exports or transfers the Services to eligible end users, it will, as required by EAR Section 741.17(e), submit semi-annual reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and address (including country) of each transferee; and (f) understands that countries other than the United States may restrict the import, use, or export of encryption products and that it shall be solely responsible for compliance with any such import, use, or export restrictions.</p>
-
-<p><strong>8. General</strong></p>
-
-<p>This Agreement is governed by North Carolina law without regard to its conflict of laws provisions. Customer consents to the jurisdiction of the federal and state courts of the State of North Carolina with respect to any disputes or issues arising out of this Agreement. This Agreement shall constitute the exclusive terms and conditions with respect to the Services provided under this Agreement to Customer by Red Hat, notwithstanding any different or additional terms that may be contained in the form of purchase order or other document used by Customer in such transactions. This Agreement contains the final, complete and exclusive statement of the agreement between the parties with respect to the transactions contemplated herein and all prior written agreements and all prior and contemporaneous oral agreements with respect to the subject matter herein are merged herein. This Agreement and the Services may not be transferred or assigned without the prior written consent of Red Hat. The unenforceability of any provision of this Agreement shall not effect the remaining provisions of this Agreement. Red Hat reserves the right to amend or modify this Agreement at any time and in any manner by providing reasonable notice to the Customer. Customer agrees that reasonable notice may be provided by posting on Red Hat's web site, the Customer's start pages, email or other written notice.</p>
-</pxt-passthrough>
commit 81243b48fbec449b67439248acbaba344326cdbd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:15:32 2009 +0100
monitoring/probe_state_summary.pxi is not referenced from anywhere, removing.
diff --git a/web/html/network/components/monitoring/probe_state_summary.pxi b/web/html/network/components/monitoring/probe_state_summary.pxi
deleted file mode 100644
index ef89ce8..0000000
--- a/web/html/network/components/monitoring/probe_state_summary.pxi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
-<pxt-use module="Sniglets::Probes" />
-
-<rhn-probe-state-summary link_url="/network/monitoring/probe_list/{mode}.pxt" />
-
-</pxt-passthrough>
commit 2fb18e3ddd6782135e4532db15a5e35b7c61e38f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:13:58 2009 +0100
legends/probes-list-legend.pxi is not referenced from anywhere, removing.
diff --git a/web/html/network/components/legends/probes-list-legend.pxi b/web/html/network/components/legends/probes-list-legend.pxi
deleted file mode 100644
index 0cd8989..0000000
--- a/web/html/network/components/legends/probes-list-legend.pxi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-
-<div class="sideleg">
- <h2>Probe State Legend</h2>
- <ul>
- <li><img src="/img/rhn-mon-ok.gif" title="Probe(s) assigned to system have an OK status"
- alt="Probe(s) assigned to system have an OK status"/>OK</li>
- <li><img src="/img/rhn-mon-warning.gif" title="Probe(s) assigned to system have a WARNING status"
- alt="Probe(s) assigned to system have a WARNING status"/>Warning</li>
- <li><img src="/img/rhn-mon-down.gif" title="Probe(s) assigned to system have a CRITICAL status"
- alt="Probe(s) assigned to system have a CRITICAL status"/>Critical</li>
- <li><img src="/img/rhn-mon-unknown.gif" title="Probe(s) assigned to system have an UNKNOWN status"
- alt="Probe(s) assigned to system have an UNKNOWN status"/>Unknown</li>
- <li><img src="/img/rhn-mon-pending.gif" title="Probe(s) assigned to system have a PENDING status"
- alt="Probe(s) assigned to system have a PENDING status"/>Pending</li>
- </ul>
-</div>
-
commit a73808e7681b42ad11277d3134720091215244ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:11:23 2009 +0100
newlogin/common.pxi is not referenced from anywhere, removing.
diff --git a/web/html/network/components/newlogin/common.pxi b/web/html/network/components/newlogin/common.pxi
deleted file mode 100644
index 21d2f48..0000000
--- a/web/html/network/components/newlogin/common.pxi
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- <pxt-use class="Sniglets::HTML" />
-
- <h2>Login:</h2>
- <table class="details" align="center">
- <tr>
- <th>Desired Login<span class="required-form-field">*</span>:</th>
- <td>
- <input maxlength="45" name="login" value="{default:login}" type="text" size="15" />
- </td>
- </tr>
- <tr>
- <th>Desired Password<span class="required-form-field">*</span>:</th>
- <td>
- <input maxlength="32" name="password1" type="password" size="15" />
- </td>
- </tr>
- <tr>
- <th>Confirm Password<span class="required-form-field">*</span>:</th>
- <td>
- <input maxlength="32" name="password2" type="password" size="15" />
- </td>
- </tr>
- </table>
- <h2>Account Information:</h2>
- <table class="details" align="center">
- <tr>
- <th>First, Last Name<span class="required-form-field">*</span>:</th>
- <td>
- {title_selectbox}
- <input maxlength="40" vcard_name="vCard.FirstName" name="first_names"
- value="{default:first_names}" type="TEXT" size="15" />
- <input maxlength="40" vcard_name="vCard.LastName" name="last_name"
- value="{default:last_name}" type="TEXT" size="15" />
- </td>
- </tr>
-
- <tr>
- <th>Email<span class="required-form-field">*</span>:</th>
- <td>
- <input maxlength="100" vcard_name="vCard.Email" name="email"
- value="{default:email}" type="TEXT" size="20" />
- </td>
- </tr>
-
-<rhn-if-var formvar="corporate">
- <tr>
- <th>
- Company<span class="required-form-field">*</span>:
- </th>
- <td>
- <input maxlength="100" vcard_name="vCard.Company" name="company" value="{default:company}" type="TEXT" size="15" />
- </td>
- </tr>
-
- <tr>
- <th>Position:</th>
- <td>
- <input maxlength="100" vcard_name="vCard.JobTitle" name="title"
- value="{default:title}" type="TEXT" size="15" />
- </td>
- </tr>
-</rhn-if-var>
-
- <tr>
- <td style="border: 0; text-align: center" colspan="2"><span class="required-form-field">*</span> - Required Field</td>
- </tr>
-</table>
-
-
-<div align="right">
-<input name="continue" type="submit" value="Create Login" />
-</div>
-</pxt-passthrough>
13 years, 5 months
11 commits - java/code web/html
by Jan Pazdziora
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 4
web/html/errors/download-expired.pxt | 18 --
web/html/errors/download-mismatch.pxt | 18 --
web/html/nav/kickstart_session_detail.xml | 10 -
web/html/nav/sitenav-authenticated.xml | 4
web/html/network/software/all_channels.pxt | 35 -----
web/html/network/software/retired_channels.pxt | 36 -----
web/html/network/systems/details/kickstart/missing_packages.pxt | 57 --------
web/html/network/systems/provisioning/.htaccess | 8 -
web/html/network/systems/provisioning/preservation/delete.pxt | 47 -------
web/html/network/systems/provisioning/preservation/edit.pxt | 67 ----------
web/html/network/systems/provisioning/preservation/preservation_list.pxt | 29 ----
web/html/network/systems/provisioning/sessions/.htaccess | 9 -
web/html/network/systems/provisioning/sessions/cancel_session.pxt | 46 ------
web/html/network/systems/provisioning/sessions/details.pxt | 63 ---------
web/html/network/systems/provisioning/sessions/history.pxt | 31 ----
web/html/network/systems/provisioning/sessions/session_details_header.pxi | 16 --
web/html/network/systems/ssm/packages/installed_systems.pxt | 27 ----
web/html/network/systems/ssm/packages/verify_system_list.pxt | 27 ----
19 files changed, 2 insertions(+), 550 deletions(-)
New commits:
commit bb00d86b59c78195c02809849cb05986de4a1af6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:05:01 2009 +0100
After both preservation and sessions is gone from provisioning, it is no longer needed, removing.
diff --git a/web/html/network/systems/provisioning/.htaccess b/web/html/network/systems/provisioning/.htaccess
deleted file mode 100644
index f8dbe97..0000000
--- a/web/html/network/systems/provisioning/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl org_entitlement(rhn_provisioning);user_role(config_admin)
commit d2d55fe5daf0fa068def36f6baa6a172eda8533d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 17:03:49 2009 +0100
/network/systems/provisioning/sessions not referenced from anywhere (besides kickstart_session_detail.xml), removing.
diff --git a/web/html/nav/kickstart_session_detail.xml b/web/html/nav/kickstart_session_detail.xml
deleted file mode 100644
index 3e23868..0000000
--- a/web/html/nav/kickstart_session_detail.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="session_detail" invisible="1" formvar="kssid" title-depth="1">
- <rhn-tab name="Details">
- <rhn-tab-url>/network/systems/provisioning/sessions/details.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/provisioning/sessions/cancel_session.pxt</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="History">
- <rhn-tab-url>/network/systems/provisioning/sessions/history.pxt</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/web/html/network/systems/provisioning/sessions/.htaccess b/web/html/network/systems/provisioning/sessions/.htaccess
deleted file mode 100644
index deddc4d..0000000
--- a/web/html/network/systems/provisioning/sessions/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl org_entitlement(rhn_provisioning);user_role(config_admin)
-
diff --git a/web/html/network/systems/provisioning/sessions/cancel_session.pxt b/web/html/network/systems/provisioning/sessions/cancel_session.pxt
deleted file mode 100644
index ba394db..0000000
--- a/web/html/network/systems/provisioning/sessions/cancel_session.pxt
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Kickstart" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-include file="/network/systems/provisioning/sessions/session_details_header.pxi" />
-
- <h2>Kickstart Session</h2>
-
- <div class="page-summary">
- <p>
- Click 'Cancel Kickstart' below to cancel this kickstart.
- </p>
- </div>
-
-<rhn-kickstart-session-details>
-<table class="details">
- <tr>
- <th>Kickstart Profile:</th>
- <td>{session_kickstart_link}</td>
- </tr>
- <tr>
- <th>State:</th>
- <td>{session_state_name}</td>
- </tr>
-</table>
-</rhn-kickstart-session-details>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
- <div align="right">
- <hr />
- <pxt-form method="post">
- <pxt-hidden name="kssid" />
- <input type="hidden" name="redirect" value="details.pxt" />
- <input type="hidden" name="pxt:trap" value="rhn:cancel-kickstart-cb" />
- <input type="submit" name="cancel_confirm" value="Cancel Kickstart" />
- </pxt-form>
- </div>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
diff --git a/web/html/network/systems/provisioning/sessions/details.pxt b/web/html/network/systems/provisioning/sessions/details.pxt
deleted file mode 100644
index 9865f85..0000000
--- a/web/html/network/systems/provisioning/sessions/details.pxt
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Kickstart" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-include file="/network/systems/provisioning/sessions/session_details_header.pxi" />
-
- <h2>Kickstart Session</h2>
-
- <div class="page-summary">
- <p><rhn-autorefresh-widget speed="fast" propagate="kssid|minutes_ahead"/></p>
- <p>
- The following status information is available about this kickstart session.
- </p>
- </div>
-<pxt-formvar>
-
-<rhn-kickstart-session-details cancel_session_link="cancel_session.pxt?kssid={formvar:kssid}">
-<table class="details">
- <tr>
- <th>System:</th>
- <td>{session_system_link}</td>
- </tr>
- <tr>
- <th>Kickstart Profile:</th>
- <td>{session_kickstart_link}</td>
- </tr>
- <tr>
- <th>System Activation:</th>
- <td>{activation_type}</td>
- </tr>
- <tr>
- <th>State:</th>
- <td>{session_state_name}</td>
- </tr>
- <tr>
- <th>Last file requested:</th>
- <td>{last_file_request}</td>
- </tr>
- <tr>
- <th>Total packages requested:</th>
- <td>{package_fetch_count}</td>
- </tr>
- <tr>
- <th>Next Action:</th>
- <td>{session_action_link}</td>
- </tr>
- <tr>
- <th>Last Action:</th>
- <td>{session_last_action}</td>
- </tr>
-</table>
-
-</rhn-kickstart-session-details>
-
-</pxt-formvar>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
diff --git a/web/html/network/systems/provisioning/sessions/history.pxt b/web/html/network/systems/provisioning/sessions/history.pxt
deleted file mode 100644
index f9f5142..0000000
--- a/web/html/network/systems/provisioning/sessions/history.pxt
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Lists" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-include file="/network/systems/provisioning/sessions/session_details_header.pxi" />
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<div class="page-summary">
- <p><rhn-autorefresh-widget speed="fast" propagate="kssid|minutes_ahead"/></p>
- <p>The following represent points in a particular kickstart's progress.</p>
-</div>
-
-
-
-<rhn-listview class="Sniglets::ListView::GeneralList" mode="kickstart_session_history">
- <column name="State" label="state_name" />
- <column name="Next Action" label="action_desc">
- <url>/network/systems/details/history/event.pxt?sid={column:system_id}&hid={column:action_id}</url>
- </column>
- <column name="Description" label="state_description" />
- <column name="Time" label="char_time" />
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
diff --git a/web/html/network/systems/provisioning/sessions/session_details_header.pxi b/web/html/network/systems/provisioning/sessions/session_details_header.pxi
deleted file mode 100644
index 6d28499..0000000
--- a/web/html/network/systems/provisioning/sessions/session_details_header.pxi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
-
- <pxt-use class="Sniglets::Kickstart" />
- <pxt-use class="Sniglets::Navi" />
-
-<rhn-kickstart-session-details>
- <h1>
- <img src="/img/rhn-kickstart_session.gif"/>
- Kickstart Session{session_for_string}
- </h1>
-</rhn-kickstart-session-details>
-
- <rhn-navi-nav prefix="session" depth="0" file="/nav/kickstart_session_detail.xml" style="contentnav" />
-
-</pxt-passthrough>
commit eba34730db9d011cf6688df56173abee39113d00
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:58:21 2009 +0100
preservation/edit.pxt and preservation/delete.pxt are not referenced either, removing whole dir.
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 1580ba5..c8f25bd 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -82,9 +82,7 @@
<rhn-tab-url>/rhn/kickstart/TreeEdit.do</rhn-tab-url>
<rhn-tab-url>/rhn/kickstart/TreeCreate.do</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="File Preservation" acl="org_entitlement(rhn_provisioning); user_role(config_admin)" url="/rhn/systems/provisioning/preservation/PreservationList.do" >
- <rhn-tab-directory>/systems/provisioning/preservation/</rhn-tab-directory>
- </rhn-tab>
+ <rhn-tab name="File Preservation" acl="org_entitlement(rhn_provisioning); user_role(config_admin)" url="/rhn/systems/provisioning/preservation/PreservationList.do" />
<rhn-tab name="snippets.jsp.toolbar" acl="org_entitlement(rhn_provisioning); user_role(config_admin)" url="/rhn/kickstart/cobbler/CustomSnippetList.do" >
<rhn-tab-url>/rhn/kickstart/cobbler/CobblerSnippetList.do</rhn-tab-url>
<rhn-tab-url>/rhn/kickstart/cobbler/CustomSnippetList.do</rhn-tab-url>
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index d1ba70e..1102c14 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -69,9 +69,7 @@
<rhn-tab-directory>/rhn/kickstart</rhn-tab-directory>
<rhn-tab-url>/rhn/kickstart/TreeEdit.do</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="File Preservation" url="/rhn/systems/provisioning/preservation/PreservationList.do" >
- <rhn-tab-directory>/systems/provisioning/preservation/</rhn-tab-directory>
- </rhn-tab>
+ <rhn-tab name="File Preservation" url="/rhn/systems/provisioning/preservation/PreservationList.do" />
</rhn-tab>
</rhn-tab>
<rhn-tab name="Errata" url="/rhn/errata/Overview.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif">
diff --git a/web/html/network/systems/provisioning/preservation/delete.pxt b/web/html/network/systems/provisioning/preservation/delete.pxt
deleted file mode 100644
index a58985e..0000000
--- a/web/html/network/systems/provisioning/preservation/delete.pxt
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Kickstart" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<rhn-toolbar base="h1" img="/img/rhn-kickstart_profile.gif" help-url="">
- Delete File Preservation List
-</rhn-toolbar>
-
- <div class="page-summary">
- <p>Are you certain you want to delete this file list?</p>
- </div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
- <pxt-form method="post">
- <table class="details">
-<rhn-kickstart-file-preserv>
- <tr>
- <th>Label:</th>
- <td>{label}</td>
- </tr>
-
- <tr>
- <th>File List:</th>
- <td><pre>{file_list}</pre></td>
- </tr>
-</rhn-kickstart-file-preserv>
- </table>
-
- <br />
-
- <div align="right">
- <hr />
-<pxt-formvar>
- <input type="hidden" name="flid" value="{formvar:flid}" />
- <input type="hidden" name="pxt:trap" value="rhn:delete_file_list_cb" />
- <input type="submit" name="Delete" value="Delete" />
-</pxt-formvar>
- </div>
- </pxt-form>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
diff --git a/web/html/network/systems/provisioning/preservation/edit.pxt b/web/html/network/systems/provisioning/preservation/edit.pxt
deleted file mode 100644
index 206ebd2..0000000
--- a/web/html/network/systems/provisioning/preservation/edit.pxt
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Kickstart" />
- <pxt-use class="Sniglets::Lists" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <pxt-formvar>
- <rhn-if-var formvar="flid">
- <rhn-toolbar base="h1" img="/img/rhn-kickstart_profile.gif" deletion-type="list" deletion-url="delete.pxt?flid={formvar:flid}"> Edit Kickstart File Preservation List </rhn-toolbar>
- </rhn-if-var>
- <rhn-unless-var formvar="flid">
- <rhn-toolbar base="h1" img="/img/rhn-kickstart_profile.gif"> Create Kickstart File Preservation List </rhn-toolbar>
- </rhn-unless-var>
- </pxt-formvar>
-
- <pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<div class="page-summary">
- <p>Any files or directories listed here will be preserved following the kickstart. List files or directories one per line.</p>
-</div>
-
- <h2>Enter file/directory names below</h2>
- <pxt-form method="post" name="edit_file_preserv">
- <rhn-kickstart-file-preserv >
- <table class="details">
- <tr>
- <th>Label:</th>
- <td>{label}</td>
- </tr>
-
- <tr>
- <th>File List:</th>
- <td>
- <textarea wrap="virtual" rows="6" cols="50" name="file:list">{file_list}</textarea>
- </td>
- </tr>
-
- <rhn-if-var formvar="flid">
- <tr>
- <th>Created:</th>
- <td>{created}</td>
- </tr>
-
- </rhn-if-var>
- </table>
-
- <input type="hidden" name="pxt:trap" value="rhn:edit_file_preserv_cb" />
-
- <div align="right">
- <hr />
- <rhn-unless-var formvar="flid">
- <input type="submit" name="Create List" value="Create List" />
- </rhn-unless-var>
- <rhn-if-var formvar="flid">
- <input type="submit" name="Update List" value="Update List" />
- </rhn-if-var>
- </div>
-
- <pxt-hidden name="flid" />
- </rhn-kickstart-file-preserv>
- </pxt-form>
-
-
- </grail-canvas-template>
-</pxt-passthrough>
commit 2d98444ca08e182c9385a37b62bf7fa8db612eb4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:55:15 2009 +0100
preservation_list.pxt is not referenced from anywhere, removing.
diff --git a/web/html/network/systems/provisioning/preservation/preservation_list.pxt b/web/html/network/systems/provisioning/preservation/preservation_list.pxt
deleted file mode 100644
index eab4056..0000000
--- a/web/html/network/systems/provisioning/preservation/preservation_list.pxt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <rhn-toolbar base="h1" img="/img/rhn-kickstart_profile.gif" creation-url="/network/systems/provisioning/preservation/edit.pxt" creation-type="file preservation list">
- File Preservation
- </rhn-toolbar>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<div class="page-summary">
- <p>The following lists of files to be preserved have been created for use by your organization</p>
-</div>
-
-<rhn-listview class="Sniglets::ListView::GeneralList" mode="preservations_for_org">
- <column name="Name" label="label" align="left" >
- <url>/network/systems/provisioning/preservation/edit.pxt?flid={column:id}</url>
- </column>
-
- <empty_list_message>No File Preservation Lists.</empty_list_message>
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
commit 9ecc5d329ded88092d90169f24b27c96a9068f2b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:49:59 2009 +0100
verify_system_list.pxt is not referenced from anywhere, removing.
diff --git a/web/html/network/systems/ssm/packages/verify_system_list.pxt b/web/html/network/systems/ssm/packages/verify_system_list.pxt
deleted file mode 100644
index 0dc455e..0000000
--- a/web/html/network/systems/ssm/packages/verify_system_list.pxt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::Packages" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1>System Set Manager</h1>
-
- <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
-
-<h2>Systems with <rhn-lookup-package-nvre /> Installed</h2>
-
-<rhn-listview class="Sniglets::ListView::SystemList"
-mode="systems_with_package_nvre_in_set">
- <formvars>
- <var name="name_id" />
- <var name="evr_id" />
- </formvars>
- <column name="Name" label="server_name" align="left">
- <url>/rhn/systems/details/Overview.do?sid={column:id}</url>
- </column>
-</rhn-listview>
-
-</grail-canvas-template>
-</pxt-passthrough>
commit fd59f77bf3084909316a07094a13a72a9a9e1008
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:47:16 2009 +0100
Removal of schedule_kickstart_cb made missing_packages.pxt unreferenced, removing.
diff --git a/web/html/network/systems/details/kickstart/missing_packages.pxt b/web/html/network/systems/details/kickstart/missing_packages.pxt
deleted file mode 100644
index 71cfdab..0000000
--- a/web/html/network/systems/details/kickstart/missing_packages.pxt
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Servers" />
- <pxt-use class="Sniglets::Lists" />
-
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-<pxt-formvar>
- <pxt-include-late file="/network/components/systems/system_details_toolbar.pxi" />
-</pxt-formvar>
-
- <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" />
-
- <h2>
- <img src="/img/rhn-icon-packages.gif" />
- Missing Packages
- </h2>
-
- <div class="page-summary">
- <p>
- The following packages are listed in the package profile which you have selected to sync, but not in the channels which the system will be entitled to when the kickstart is complete. You can select a new target package profile by clicking 'select new package profile' below.
- </p>
- <p>
- If you select 'Remove listed packages from sync', then none of the listed packages will be installed.
- </p>
- <p>
- If you select 'Subscribe to channels if available', then the
- system will be subscribed to the necessary channels to install
- the listed packages. Packages that are not available in any
- channels will not be installed.
- </p>
- </div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<pxt-formvar>
-<rhn-listview class="Sniglets::ListView::PackageList" mode="missing_packages_for_session" alphabar_column="nvre">
- <formvars>
- <var name="sid" />
- </formvars>
-
- <column name="Package" label="nvre" sort_by="1">
- <url>/rhn/software/packages/Details.do?sid={formvar:sid}&id_combo={column:id}</url>
- </column>
-
- <column name="Channels" label="channels"/>
-
- <action name="Select new package profile" label="new_session" url="/network/systems/details/kickstart/options.pxt"/>
- <action name="Remove listed packages from sync" label="remove_packages" url="/network/systems/details/kickstart/options.pxt"/>
- <action name="Subscribe to channels if available" label="subscribe_to_channels" url="/network/systems/details/kickstart/options.pxt"/>
-</rhn-listview>
-</pxt-formvar>
-
- </grail-canvas-template>
-</pxt-passthrough>
commit 1f20c0a7d5c79bcc8e6918ca15ff14868b8a1b59
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:45:41 2009 +0100
installed_systems.pxt is not referenced from anywhere, removing.
diff --git a/web/html/network/systems/ssm/packages/installed_systems.pxt b/web/html/network/systems/ssm/packages/installed_systems.pxt
deleted file mode 100644
index 093bf6e..0000000
--- a/web/html/network/systems/ssm/packages/installed_systems.pxt
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
-
- <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav"/>
-
-<h2>Systems with <foo /></h2>
-
- <div class="page-summary">
-<p>The following selected systems currently have <foo /> installed:</p>
- </div>
-
-<rhn-listview class="Sniglets::ListView::SystemList" mode="selected_systems_installed_package" alphabar_column="server_name">
- <formvars><var name="id_combo" /></formvars>
- <column name="Name" label="server_name" sort_by="1" align="left" />
- <column name="Installed Version(s)" label="installed_version"
- align="left" />
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
commit ddc0ab692267af5d848aaed814582bcbc2afc378
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:33:54 2009 +0100
download-mismatch.pxt is not referenced from anywhere, removing.
diff --git a/web/html/errors/download-mismatch.pxt b/web/html/errors/download-mismatch.pxt
deleted file mode 100644
index ae3c9dd..0000000
--- a/web/html/errors/download-mismatch.pxt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Users" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1>Download Error - Malformed URL</h1>
-
-<pxt-http-status code="401" />
-
- <p>You have attempted to download a file, but the URL you have used
- is malformed. Please check the URL for any copy-paste errors. If you
- have confirmed the URL is correct, please contact your local administrator
- for assistance.</p>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
commit b9794d29fb6388b3e7104257f1e763010f3dc80b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:33:35 2009 +0100
download-expired.pxt is not referenced from anywhere, removing.
diff --git a/web/html/errors/download-expired.pxt b/web/html/errors/download-expired.pxt
deleted file mode 100644
index 060491b..0000000
--- a/web/html/errors/download-expired.pxt
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Users" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
- <h1>Download Error - URL Expired</h1>
-
-<pxt-http-status code="410" />
-
- <p>You have attempted to download a file, but the URL you have used
- has expired. Please return to the page that generated this URL,
- reload it, and try again. If the problem persists, please
- contact your local administrator for assistance.</p>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
commit b2b329918f79b446a0baae02c2998b70786b62ee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:29:01 2009 +0100
retired_channels.pxt is not referenced from anywhere, removing.
diff --git a/web/html/network/software/retired_channels.pxt b/web/html/network/software/retired_channels.pxt
deleted file mode 100644
index ed6cefd..0000000
--- a/web/html/network/software/retired_channels.pxt
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Users" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1><img src="/img/rhn-icon-channels.gif" /> Retired Software Channel List</h1>
-
- <div class="page-summary">
- <p>
- All retired software channels available to your organization
- are listed below. Retired channels have reached their
- end-of-life date and do not receive new errata.
- </p>
- </div>
-
-<rhn-listview class="Sniglets::ListView::ChannelList" mode="eol_all_channels_tree" style="channel_tree">
- <column name="Channel Name" label="name">
- <url>/rhn/channels/ChannelDetail.do?cid={column:id}</url>
- </column>
-
- <column name="Packages" label="package_count" align="center">
- <url>/rhn/channels/ChannelPackages.do?cid={column:id}</url>
- </column>
-
- <column name="Systems" label="system_count" align="center">
- <url>/rhn/channels/ChannelSubscribers.do?cid={column:id}</url>
- </column>
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
commit d3ccf42dae438702b5c1d2a29729d08951cd9e7b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 16:28:32 2009 +0100
all_channels.pxt is not referenced from anywhere, removing.
diff --git a/web/html/network/software/all_channels.pxt b/web/html/network/software/all_channels.pxt
deleted file mode 100644
index 2a5dfd6..0000000
--- a/web/html/network/software/all_channels.pxt
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
- <pxt-use class="Sniglets::Users" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1><img src="/img/rhn-icon-channels.gif" /> Full Software Channel List <rhn-help href="s1-sm-channels-packages.jsp" />
- </h1>
-
- <div class="page-summary">
- <p>
- All currently-supported software channels available to your organization are listed below.
- </p>
- </div>
-
-<rhn-listview class="Sniglets::ListView::ChannelList" mode="non_eol_all_channels_tree" style="channel_tree">
- <column name="Channel Name" label="name">
- <url>/rhn/channels/ChannelDetail.do?cid={column:id}</url>
- </column>
-
- <column name="Packages" label="package_count" align="center">
- <url>/rhn/channels/ChannelPackages.do?cid={column:id}</url>
- </column>
-
- <column name="Systems" label="system_count" align="center">
- <url>/rhn/channels/ChannelSubscribers.do?cid={column:id}</url>
- </column>
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
13 years, 5 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2408dba53bce2d140caa4a99d9cb1574b98128ad
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Dec 22 10:56:39 2009 -0500
526823 - improving speed of scheduling package installs for 1000s of systems
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 74d293d..3b2f422 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
@@ -601,8 +601,8 @@ SELECT DISTINCT SP.server_id id,
SP.name_id || '|' || SP.evr_id || '|' || SP.package_arch_id AS ID_COMBO
FROM rhnServerPackage SP
WHERE SP.server_id IN (%s)
- AND SP.name_id || '|' || SP.evr_id || '|' || SP.package_arch_id IN (SELECT element || '|' || element_two || '|' || element_three FROM rhnSet WHERE user_id = :user_id AND label = :package_set_label)
- </elaborator>
+ AND exists (select 1 from rhnSet where user_id = :user_id and label = :package_set_label and element = SP.name_id and element_two = SP.evr_id and element_three = SP.package_arch_id)
+ </elaborator>
</mode>
<mode name="system_set_remove_or_verify_packages_conf">
13 years, 5 months