java/code/webapp/WEB-INF/nav/channel_detail.xml | 1
web/html/network/software/channels/gpg_info.pxt | 41 ------------------------
web/include/nav/channel_detail.xml | 1
web/modules/sniglets/Sniglets/Channel.pm | 32 ------------------
4 files changed, 75 deletions(-)
New commits:
commit 1493265e6680e2e766e842a01b0f2b72297730fd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 4 13:39:41 2013 +0100
The gpg_info.pxt is only referenced from channel_gpg_key, only used by
rhn-channel-gpg-key in this page, removing.
diff --git a/java/code/webapp/WEB-INF/nav/channel_detail.xml
b/java/code/webapp/WEB-INF/nav/channel_detail.xml
index 7279c32..d2c3c17 100644
--- a/java/code/webapp/WEB-INF/nav/channel_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/channel_detail.xml
@@ -3,7 +3,6 @@
acl_mixins="com.redhat.rhn.common.security.acl.ChannelAclHandler">
<rhn-tab name="Details">
<rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Subscribers"
acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin)
or user_can_admin_channel()">
<rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
diff --git a/web/html/network/software/channels/gpg_info.pxt
b/web/html/network/software/channels/gpg_info.pxt
deleted file mode 100644
index 644ff4c..0000000
--- a/web/html/network/software/channels/gpg_info.pxt
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::Navi" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt"
mode="main_canvas">
-
-<rhn-channel-details>
- <h1><img src="/img/rhn-icon-channels.gif" /> {channel_name}
<rhn-help href="s1-sm-channels-packages.jsp" /></h1>
-
- <rhn-navi-nav prefix="channel_details" depth="0"
file="/nav/channel_detail.xml" style="contentnav" />
-
- <h2>3rd Party GPG Key Import</h2>
-
- <div class="page-summary">
- <p>This channel has a GPG key associated with it. For a system to be able to
download and install packages from this channel, you must import the key into a particular
keyring.</p>
-
- <p>The GPG key is located at:</p>
-
-<rhn-channel-gpg-key>
- <p><a
href="{channel_gpg_key_url}">{channel_gpg_key_url}</a></p>
-</rhn-channel-gpg-key>
-
- <p>Once you have downloaded the key file, you must import it to your RPM
-keyring. You <strong>must</strong> upgrade your system to use the latest
version of up2date before
-installing third party keys on your system.</p>
-
- <p>If you are running Red Hat Enterprise Linux v.3 or newer, use the
following command as root to import the new key:</p>
- <code><strong>rpm --import
/path/to/gpg_key.txt</strong></code>
-
- <p>If you are running Red Hat Enterprise Linux v.2.1, or Red Hat Linux 7.3 or
earlier, use the following command as root to import the new key:</p>
- <code><strong>gpg $(up2date --gpg-flags) --import
/path/to/gpg_key.txt</strong></code>
-
- </div>
-</rhn-channel-details>
-
- </grail-canvas-template>
-</pxt-passthrough>
diff --git a/web/include/nav/channel_detail.xml b/web/include/nav/channel_detail.xml
index c0ee0c4..9d864bb 100644
--- a/web/include/nav/channel_detail.xml
+++ b/web/include/nav/channel_detail.xml
@@ -2,7 +2,6 @@
<rhn-navi-tree label="channel_detail" invisible="1"
formvar="cid" title-depth="1"
acl_mixins="RHN::Access::Channel">
<rhn-tab name="Details">
<rhn-tab-url>/rhn/channels/ChannelDetail.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/gpg_info.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Subscribers"
acl="org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin)
or user_can_admin_channel()">
<rhn-tab-url>/network/software/channels/subscribers.pxt</rhn-tab-url>
diff --git a/web/modules/sniglets/Sniglets/Channel.pm
b/web/modules/sniglets/Sniglets/Channel.pm
index 5cbc7f2..6ef5ac3 100644
--- a/web/modules/sniglets/Sniglets/Channel.pm
+++ b/web/modules/sniglets/Sniglets/Channel.pm
@@ -36,8 +36,6 @@ sub register_tags {
$pxt->register_tag('rhn-channel-details' => \&channel_details);
- $pxt->register_tag('rhn-channel-gpg-key' => \&channel_gpg_key);
-
$pxt->register_tag('viewed_channel_name' => \&viewed_channel_name,
-10);
}
@@ -54,36 +52,6 @@ my $UNSUBSCRIBE = 2;
-sub channel_gpg_key {
- my $pxt = shift;
- my %params = @_;
-
- my $cid = $pxt->param('cid');
-
- die "No cid!" unless defined $cid;
- die "no permission for channel $cid!" unless
$pxt->user->org->has_channel_permission($cid);
-
- my $block = $params{__block__};
- my $channel = RHN::Channel->lookup(-id => $cid);
-
- my %subst;
- $subst{channel_gpg_key_url} = PXT::Utils->escapeHTML($channel->gpg_key_url() ||
'');
-
- return '' unless $subst{channel_gpg_key_url};
-
- if ($subst{channel_gpg_key_url} =~ m{^http(s)?://}) {
- $subst{channel_gpg_key_url} = "<a
href=\"".$pxt->derelative_url($subst{channel_gpg_key_url},
'https')."\">".$subst{channel_gpg_key_url}."</a>";
- }
-
- $subst{channel_gpg_info_url} =
$pxt->derelative_url("/network/software/channels/gpg_info.pxt?cid=$cid",
'https');
- $subst{channel_gpg_key_id} = $channel->gpg_key_id() || 'unknown';
- $subst{channel_gpg_key_fp} = $channel->gpg_key_fp() || 'unknown';
-
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
-
sub channel_details {
my $pxt = shift;
my %params = @_;
Show replies by date