On 03/02/2012 05:55 PM, Duncan Mac-Vicar P. wrote:
On 03/02/2012 04:06 PM, Tomas Lestach wrote:
There's one more thing confusing for me, when we're in the errata area.
I mean following two pages
https://<spacewalk>/rhn/errata/Overview.do
https://<spacewalk>/rhn/errata/RelevantErrata.do
display the same errata content.
We might want to drop one of them.
Ok, I have a patch that gets rid of errata/Overview.do. I need to
rebase for master.
attached.
Is the removal of strings with this file as context needed?
Duncan
>From 36ebcfc0f1be2cb7c193907f3a0f81716bb18771 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P <dmacvi...@suse.de>
Date: Fri, 2 Mar 2012 17:50:04 +0100
Subject: [PATCH] errata/Overview.do and errata/RelevantErrata.do provide the
same list. Get rid of Overview and use RelevantErrata
instead. See
https://www.redhat.com/archives/spacewalk-devel/2012-March/msg00003.html
Conflicts:
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
---
.../webapp/WEB-INF/nav/errata_overview_tabs.xml | 15 ---------
.../webapp/WEB-INF/nav/sitenav-authenticated.xml | 4 +-
java/code/webapp/WEB-INF/pages/errata/overview.jsp | 27 ---------------
java/code/webapp/WEB-INF/struts-config.xml | 34 +-------------------
java/scripts/lwload.pl | 2 +-
5 files changed, 4 insertions(+), 78 deletions(-)
delete mode 100644 java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml
delete mode 100644 java/code/webapp/WEB-INF/pages/errata/overview.jsp
diff --git a/java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml b/java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml
deleted file mode 100644
index b259d08..0000000
--- a/java/code/webapp/WEB-INF/nav/errata_overview_tabs.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<rhn-navi-tree label="errata_tabs" invisible="1" formvar="prid" title-depth="1">
- <rhn-tab name="erratalist.jsp.allerrata">
- <rhn-tab-url>/rhn/errata/Overview.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="yourrhn.jsp.criticalsystems.bugfixerrata">
- <rhn-tab-url>/rhn/errata/OverviewBugErrata.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="yourrhn.jsp.criticalsystems.enhancementerrata">
- <rhn-tab-url>/rhn/errata/OverviewEnhancementErrata.do</rhn-tab-url>
- </rhn-tab>
- <rhn-tab name="yourrhn.jsp.criticalsystems.securityerrata">
- <rhn-tab-url>/rhn/errata/OverviewSecurityErrata.do</rhn-tab-url>
- </rhn-tab>
-</rhn-navi-tree>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 49f9a2b..129cd55 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -109,8 +109,8 @@
</rhn-tab>
</rhn-tab>
</rhn-tab>
- <rhn-tab name="Errata" url="/rhn/errata/Overview.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
- <rhn-tab name="Errata" url="/rhn/errata/Overview.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
+ <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" active-image="tab-errata-selected.gif" inactive-image="tab-errata.gif" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
+ <rhn-tab name="Errata" url="/rhn/errata/RelevantErrata.do" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
<rhn-tab-directory>/rhn/errata</rhn-tab-directory>
<rhn-tab name="Relevant" on-click="Sniglets::Lists->navi_empty_set" node-id="target_systems_list">
<rhn-tab-url>/rhn/errata/RelevantErrata.do</rhn-tab-url>
diff --git a/java/code/webapp/WEB-INF/pages/errata/overview.jsp b/java/code/webapp/WEB-INF/pages/errata/overview.jsp
deleted file mode 100644
index 6842a08..0000000
--- a/java/code/webapp/WEB-INF/pages/errata/overview.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ taglib uri="http://rhn.redhat.com/rhn"; prefix="rhn" %>
-<%@ taglib uri="http://rhn.redhat.com/tags/list"; prefix="rl" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
-
-<html:xhtml/>
-<html>
-<head>
- <meta name="page-decorator" content="none" />
-</head>
-<body>
-<rhn:toolbar base="h1" img="/img/rhn-icon-errata.gif" imgAlt="errata.overview.jsp.alt"
- helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp">
- <bean:message key="errata.overview.jsp.errataoverview"/>
-</rhn:toolbar>
-
-<rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/errata_overview_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
-
-<p><bean:message key="errata.overview.jsp.summary"/></p>
-
-<h2><bean:message key="errata.jsp.header"/></h2>
-
-<%@ include file="/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf" %>
-
-</body>
-</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index a6d7560..1d75f49 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1182,7 +1182,7 @@
<forward name="relogin" path="/ReLogin.do" />
<forward name="user" path="/users/ActiveList.do" redirect="true" />
<forward name="audit" path="/audit/Overview.do" redirect="true" />
- <forward name="errata" path="/errata/Overview.do" redirect="true" />
+ <forward name="errata" path="/errata/RelevantErrata.do" redirect="true" />
<forward name="systems" path="/systems/Overview.do" redirect="true" />
<forward name="schedule" path="/schedule/PendingActions.do" redirect="true" />
</global-forwards>
@@ -1950,38 +1950,6 @@
path="/WEB-INF/pages/errata/all.jsp" />
</action>
- <action path="/errata/Overview"
- scope="request"
- input="/WEB-INF/pages/errata/overview.jsp"
- type="com.redhat.rhn.frontend.action.errata.ErrataListRelevantAction">
- <forward name="default"
- path="/WEB-INF/pages/errata/overview.jsp"/>
- </action>
-
- <action path="/errata/OverviewBugErrata"
- scope="request"
- input="/WEB-INF/pages/errata/overview.jsp"
- type="com.redhat.rhn.frontend.action.errata.BugErrataListRelevantAction">
- <forward name="default"
- path="/WEB-INF/pages/errata/overview.jsp"/>
- </action>
-
- <action path="/errata/OverviewEnhancementErrata"
- scope="request"
- input="/WEB-INF/pages/errata/overview.jsp"
- type="com.redhat.rhn.frontend.action.errata.EnhancementErrataListRelevantAction">
- <forward name="default"
- path="/WEB-INF/pages/errata/overview.jsp"/>
- </action>
-
- <action path="/errata/OverviewSecurityErrata"
- scope="request"
- input="/WEB-INF/pages/errata/overview.jsp"
- type="com.redhat.rhn.frontend.action.errata.SecurityErrataListRelevantAction">
- <forward name="default"
- path="/WEB-INF/pages/errata/overview.jsp"/>
- </action>
-
<action path="/errata/RelevantErrata"
scope="request"
input="/WEB-INF/pages/errata/relevant.jsp"
diff --git a/java/scripts/lwload.pl b/java/scripts/lwload.pl
index b89187a..ac39289 100755
--- a/java/scripts/lwload.pl
+++ b/java/scripts/lwload.pl
@@ -46,7 +46,7 @@ while (1 == 1) {
sub loop_pages {
my $cnt = 0;
while ($cnt < 100) {
- my $output = hit_page("https://$server/rhn/errata/Overview.do";, $cookie);
+ my $output = hit_page("https://$server/rhn/errata/RelevantErrata.do";, $cookie);
$output = hit_page("https://$server/rhn/errata/AllErrata.do";, $cookie);
$output = hit_page("https://$server/rhn/schedule/PendingActions.do";, $cookie);
$output = hit_page("https://$server/rhn/systems/Unentitled.do";, $cookie);
--
1.7.7
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
