Hello, for making it more generic, we refactored the web UI vendor channel listing from 'RedHat.do' to 'Vendor.do'. Unfortunately, doing this in a consistent way includes changes in quite an amount of files. If this refactoring is still acceptable for upstream, you might want to apply my attached patch.
Thank you, Johannes -- SUSE LINUX Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg)
>From 506bbd5b7df16f0bdf04de8b31b3b4fc4f80b5c7 Mon Sep 17 00:00:00 2001 From: Johannes Renner <jren...@suse.de> Date: Tue, 5 Jul 2011 11:47:55 +0200 Subject: [PATCH] Refactor RedHat.do to Vendor.do --- .../common/db/datasource/xml/Channel_queries.xml | 2 +- .../action/channel/RedHatChannelTreeAction.java | 35 ------------------ .../action/channel/VendorChannelTreeAction.java | 35 ++++++++++++++++++ .../frontend/strings/jsp/StringResource_bn_IN.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_de.xml | 2 +- .../frontend/strings/jsp/StringResource_en_US.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_es.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_fr.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_gu.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_hi.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_it.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_ja.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_ko.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_pa.xml | 2 +- .../frontend/strings/jsp/StringResource_pt_BR.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_ru.xml | 2 +- .../rhn/frontend/strings/jsp/StringResource_ta.xml | 2 +- .../frontend/strings/jsp/StringResource_zh_CN.xml | 2 +- .../frontend/strings/jsp/StringResource_zh_TW.xml | 2 +- .../frontend/strings/nav/StringResource_en_US.xml | 2 +- .../frontend/xmlrpc/channel/ChannelHandler.java | 2 +- .../redhat/rhn/manager/channel/ChannelManager.java | 8 ++-- .../manager/channel/test/ChannelManagerTest.java | 4 +- java/code/webapp/WEB-INF/nav/channel_tabs.xml | 4 +- .../webapp/WEB-INF/nav/sitenav-authenticated.xml | 2 +- java/code/webapp/WEB-INF/pages/channel/redhat.jsp | 38 -------------------- java/code/webapp/WEB-INF/pages/channel/vendor.jsp | 38 ++++++++++++++++++++ java/code/webapp/WEB-INF/struts-config.xml | 8 ++-- web/html/nav/sitenav-authenticated.xml | 2 +- 29 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java create mode 100644 java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java delete mode 100644 java/code/webapp/WEB-INF/pages/channel/redhat.jsp create mode 100644 java/code/webapp/WEB-INF/pages/channel/vendor.jsp diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index 655639f..f2bdac4 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -443,7 +443,7 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members, CFO.max_mem -<mode name="redhat_channel_tree" class="com.redhat.rhn.frontend.dto.ChannelTreeNode"> +<mode name="vendor_channel_tree" class="com.redhat.rhn.frontend.dto.ChannelTreeNode"> <query params="user_id"> select Distinct C.id, C.name, diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java deleted file mode 100644 index f5b61d9..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) 2009--2010 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 com.redhat.rhn.frontend.action.channel; - -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.listview.ListControl; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.channel.ChannelManager; - -/** - * ChannelTreeRelevantSetupAction - * @version $Rev$ - */ -public class RedHatChannelTreeAction extends BaseChannelTreeAction { - - /** {@inheritDoc} */ - protected DataResult getDataResult(RequestContext requestContext, ListControl lc) { - User user = requestContext.getCurrentUser(); - DataResult dr = ChannelManager.redHatChannelTree(user, lc); - return dr; - } -} diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java new file mode 100644 index 0000000..58de235 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java @@ -0,0 +1,35 @@ +/** + * Copyright (c) 2009--2010 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 com.redhat.rhn.frontend.action.channel; + +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.listview.ListControl; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.manager.channel.ChannelManager; + +/** + * ChannelTreeRelevantSetupAction + * @version $Rev$ + */ +public class VendorChannelTreeAction extends BaseChannelTreeAction { + + /** {@inheritDoc} */ + protected DataResult getDataResult(RequestContext requestContext, ListControl lc) { + User user = requestContext.getCurrentUser(); + DataResult dr = ChannelManager.vendorChannelTree(user, lc); + return dr; + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index 6dbc951..b682c7f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -12217,7 +12217,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>নিমà§à¦¨à¦²à¦¿à¦à¦¿à¦¤ সফà§à¦à¦à§à§à¦¯à¦¾à¦° à¦à§à¦¯à¦¾à¦¨à§à¦²à¦à§à¦²à¦¿ Red Hat à¦à§à¦¯à¦¾à¦¨à§à¦² ঠথবা Red Hat à¦à§à¦¯à¦¾à¦¨à§à¦²à§à¦° à¦à¦¾à¦à¦²à§à¦¡ à¦à§à¦¯à¦¾à¦¨à§à¦²à¥¤</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 875b44b..4cb6a39 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -12235,7 +12235,7 @@ Anschlie&szlig;end wird das nicht-chroot Post-Skript ausgef&uuml;hrt, un <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target>Die unten aufgeführten Software-Channels sind <strong>alle Channels</strong>, auf die Ihre Organisation Zugriff hat.</target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>Die unten aufgelisteten Software-Channels sind Red Hat Channels oder Sub-Channels von Red Hat Channels.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 1ff2e2b..4960777 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -12550,7 +12550,7 @@ the <strong>@@ENTERPRISE_LINUX_NAME@@ System Administration Guide.</str <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> </trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> </trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 5f53f80..9e400c3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -12230,7 +12230,7 @@ el <strong>Manual de administración del sistema Red Hat Enterprise Linux. <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target>Los canales software listados a continuación son <strong>todos los canales</strong> a los que su organización tiene acceso. </target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>Los canales de software listados a continuación son canales de Red Hat o canales hijos de canales de Red Hat.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index ce9ca2e..a157c26 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -12233,7 +12233,7 @@ Le script post non-chroot sera ensuite exécuté et le script post sera enfin ex <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target>Les canaux de logiciels ci-dessous sont <strong>tous les canaux</strong> auxquels votre entreprise a accès.</target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>Les canaux logiciels listés ci-dessous sont des canaux Red Hat ou des canaux enfants de canaux Red Hat.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 4e6d2bd..6d1ebcf 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -12218,7 +12218,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>નà«àªà« યાદૠથયà«àª² સà«àª«à«àªàªµà«àª° àªà«àª¨àª²à« ઠRed Hat àªà«àª¨àª²à«àª¨à« Red Hat àªà«àª¨àª²à« ઠથવા બાળ àªà«àª¨àª²à« àªà«.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 6953436..8f58ff4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -12218,7 +12218,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>नà¥à¤à¥ सà¥à¤à¥à¤¬à¤¦à¥à¤§ सà¥à¤«à¥à¤à¤µà¥à¤¯à¤° à¤à¥à¤¨à¤² Red Hat à¤à¥à¤¨à¤² या Red Hat à¤à¤¾ सà¤à¤¤à¤¤à¤¿ à¤à¥à¤¨à¤² हà¥.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 784aac3..5dc54a0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -12215,7 +12215,7 @@ la <strong>Red Hat Enterprise Linux System Administration Guide.</stron <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>I canali software di seguito elencati sono i canali di Red Hat o canali figlio di Red Hat Channels.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 990aa2f..48aa4ee 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -12217,7 +12217,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target>以ä¸ã«ãªã¹ããããã½ããã¦ã§ã¢ãã£ã³ãã«ã¯ãçµç¹ãã¢ã¯ã»ã¹ã§ãã<strong>ãã¹ã¦ã®ãã£ã³ãã«</strong>ã§ãã</target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>以ä¸ã«è¡¨ç¤ºããã¦ããã½ããã¦ã§ã¢ãã£ã³ãã«ã¯ãRed Hat ãã£ã³ãã«ã¾ã㯠Red Hat ãã£ã³ãã«ã®åãã£ã³ãã«ã§ãã</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 98e578c..3c4c7c9 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -12213,7 +12213,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>ë¤ìì ìíí¸ì¨ì´ ì±ë 목ë¡ì Red Hat ì±ëì´ê±°ë Red Hat ì±ëì ìì ì±ëì ëë¤. </target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 43479f9..af2c674 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -12217,7 +12217,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>ਹà©à¨ ਾਠਦਿੱਤ੠ਸਾà¨à¨«à¨µà©à¨ ਰ à¨à©à¨¨à¨² Red Hat à¨à©à¨¨à¨² à¨à¨¾à¨ Red Hat à¨à©à¨¨à¨²à¨¾à¨ ਦ੠ਠਧà©à¨¨ à¨à©à¨¨à¨² ਹਨ।</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index cc483d3..b39694d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -12224,7 +12224,7 @@ o <strong>Guia de Administração de Sistemas Red Hat Enterprise Li <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target>Os canais de software listados abaixo são <strong>todos os canais</strong> que sua organização tem acesso.</target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>Os canais de software listados abaixo são canais da Red Hat ou canais filho do Red Hat Channels.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index be15e6c..fe7dcf5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -12212,7 +12212,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>ÐеÑеÑиÑленнÑе ниже пÑогÑаммнÑе ÐºÐ°Ð½Ð°Ð»Ñ ÑвлÑÑÑÑÑ ÐºÐ°Ð½Ð°Ð»Ð°Ð¼Ð¸ Red Hat или Ð¸Ñ Ð´Ð¾ÑеÑними каналами.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index dad202c..859c48f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -12218,7 +12218,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>à®à¯à®´à¯ பà®à¯à®à®¿à®¯à®²à®¿à®à®ªà¯à®ªà®à¯à® à®®à¯à®©à¯à®ªà¯à®°à¯à®³à¯ தà®à®à¯à®à®³à¯ Red Hat தà®à®à¯à®à®³à¯ ஠லà¯à®²à®¤à¯ Red Hat தà®à®à¯à®à®³à®¿à®©à¯ à®à¯à®¯à¯ தà®à®à¯à®à®³à®¾à® à®à®°à¯à®à¯à®à®²à®¾à®®à¯.à®à®³à¯ à®à®à¯à®®à¯.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index e9a36df..ea20b0b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -12228,7 +12228,7 @@ kickstart åèæ¬çå 容å¯ä»¥å¨ <strong>ã红帽ä¼ä¸ç Linux ç³» <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target>ä¸é¢ååºç软件é¢éæ¯æ¨çç»ç»å¯ä»¥è®¿é®ç<strong>ææé¢é</strong>ã</target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>以ä¸ååºç软件å é¢éæ¯çº¢å¸½é¢éæè 红帽é¢éçåé¢éã</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 9839012..db926f1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -12214,7 +12214,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> <target></target></trans-unit> - <trans-unit id="channels.redhat.jsp.header1"> + <trans-unit id="channels.vendor.jsp.header1"> <source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source> <target>以ä¸ååºçè»é«é »éçº Red Hat Channels ç Red Hat é »éæåé »éã</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml index 451472e..adc0736 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml @@ -273,7 +273,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"; </context-group> </trans-unit> - <trans-unit id="channel.nav.redhat"> + <trans-unit id="channel.nav.vendor"> <source>Red Hat Channels</source> <context-group name="ctx"> <context context-type="sourcefile">Channel Navigation Menu</context> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java index 0b952fd..a1135b0 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java @@ -136,7 +136,7 @@ public class ChannelHandler extends BaseHandler { */ public Object[] listRedHatChannels(String sessionKey) { User user = ChannelHandler.getLoggedInUser(sessionKey); - DataResult<ChannelTreeNode> dr = ChannelManager.redHatChannelTree(user, null); + DataResult<ChannelTreeNode> dr = ChannelManager.vendorChannelTree(user, null); dr.elaborate(); return dr.toArray(); } diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 9d83875..d696816 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -429,14 +429,14 @@ public class ChannelManager extends BaseManager { /** * Returns a list of ChannelTreeNodes that have orgId null - * or has a prarent with org_id null - * @param user who we are requesting Red Hat channels for + * or has a parent with org_id null + * @param user who we are requesting channels for * @param lc ListControl to use * @return list of ChannelTreeNode's */ - public static DataResult redHatChannelTree(User user, + public static DataResult vendorChannelTree(User user, ListControl lc) { - SelectMode m = ModeFactory.getMode("Channel_queries", "redhat_channel_tree"); + SelectMode m = ModeFactory.getMode("Channel_queries", "vendor_channel_tree"); Map params = new HashMap(); diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java index 4ceb38e..2103e46 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java @@ -157,14 +157,14 @@ public class ChannelManagerTest extends BaseTestCaseWithUser { } - public void testRedHatChannelTree() throws Exception { + public void testVendorChannelTree() throws Exception { Channel channel = ChannelFactoryTest.createTestChannel(user); channel.setOrg(null); OrgFactory.save(user.getOrg()); ChannelFactory.save(channel); - DataResult dr = ChannelManager.redHatChannelTree(user, null); + DataResult dr = ChannelManager.vendorChannelTree(user, null); assertNotEmpty(dr); } diff --git a/java/code/webapp/WEB-INF/nav/channel_tabs.xml b/java/code/webapp/WEB-INF/nav/channel_tabs.xml index 924800f..5471bc5 100644 --- a/java/code/webapp/WEB-INF/nav/channel_tabs.xml +++ b/java/code/webapp/WEB-INF/nav/channel_tabs.xml @@ -4,8 +4,8 @@ <rhn-tab name="channel.nav.all"> <rhn-tab-url>/rhn/software/channels/All.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="channel.nav.redhat" acl="is_satellite()"> - <rhn-tab-url>/rhn/software/channels/RedHat.do</rhn-tab-url> + <rhn-tab name="channel.nav.vendor" acl="is_satellite()"> + <rhn-tab-url>/rhn/software/channels/Vendor.do</rhn-tab-url> </rhn-tab> <rhn-tab name="channel.nav.popular"> <rhn-tab-url>/rhn/software/channels/Popular.do</rhn-tab-url> diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml index b7c7530..b9299ab 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml @@ -139,7 +139,7 @@ <rhn-tab name="Software Channels" url="/rhn/software/channels/All.do"> <rhn-tab-directory>/rhn/channels</rhn-tab-directory> <rhn-tab name="channel.nav.all" url="/rhn/software/channels/All.do"/> - <rhn-tab name="channel.nav.redhat" url="/rhn/software/channels/RedHat.do" acl="is_satellite()"/> + <rhn-tab name="channel.nav.vendor" url="/rhn/software/channels/Vendor.do" acl="is_satellite()"/> <rhn-tab name="channel.nav.popular" url="/rhn/software/channels/Popular.do"/> <rhn-tab name="channel.nav.custom" url="/rhn/software/channels/Custom.do"/> <rhn-tab name="channel.nav.shared" url="/rhn/software/channels/Shared.do"/> diff --git a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp b/java/code/webapp/WEB-INF/pages/channel/redhat.jsp deleted file mode 100644 index e0228ed..0000000 --- a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp +++ /dev/null @@ -1,38 +0,0 @@ -<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %> -<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %> -<%@ taglib uri="http://rhn.redhat.com/rhn"; prefix="rhn" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> -<html:xhtml/> -<html> - -<head> -<script src="/javascript/channel_tree.js" type="text/javascript"></script> -<script type="text/javascript"> -var filtered = ${requestScope.isFiltered}; -function showFiltered() { - if (filtered) - ShowAll(); -} -</script> -</head> - -<body onLoad="onLoadStuff(3); showFiltered();"> -<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif" imgAlt="channels.overview.toolbar.imgAlt"> - <bean:message key="channel.nav.redhat"/> -</rhn:toolbar> - -<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tabs.jspf" %> - -<p> -<bean:message key="channels.redhat.jsp.header1" /> -</p> - - -<form method="post" name="rhn_list" action="/rhn/software/channels/RedHat.do"> - <rhn:csrf /> - <rhn:submitted /> - <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tree.jspf" %> -</form> - -</body> -</html> diff --git a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp new file mode 100644 index 0000000..525e39d --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp @@ -0,0 +1,38 @@ +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"; prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/rhn"; prefix="rhn" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> +<html:xhtml/> +<html> + +<head> +<script src="/javascript/channel_tree.js" type="text/javascript"></script> +<script type="text/javascript"> +var filtered = ${requestScope.isFiltered}; +function showFiltered() { + if (filtered) + ShowAll(); +} +</script> +</head> + +<body onLoad="onLoadStuff(3); showFiltered();"> +<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif" imgAlt="channels.overview.toolbar.imgAlt"> + <bean:message key="channel.nav.vendor"/> +</rhn:toolbar> + +<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tabs.jspf" %> + +<p> +<bean:message key="channels.vendor.jsp.header1" /> +</p> + + +<form method="post" name="rhn_list" action="/rhn/software/channels/Vendor.do"> + <rhn:csrf /> + <rhn:submitted /> + <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tree.jspf" %> +</form> + +</body> +</html> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index eb15cb1..16940eb 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -2455,12 +2455,12 @@ <!-- ===== CHANNELS ===== --> - <action path="/software/channels/RedHat" + <action path="/software/channels/Vendor" scope="request" - input="/WEB-INF/pages/channel/redhat.jsp" - type="com.redhat.rhn.frontend.action.channel.RedHatChannelTreeAction"> + input="/WEB-INF/pages/channel/vendor.jsp" + type="com.redhat.rhn.frontend.action.channel.VendorChannelTreeAction"> <forward name="default" - path="/WEB-INF/pages/channel/redhat.jsp" /> + path="/WEB-INF/pages/channel/vendor.jsp" /> </action> <action path="/software/channels/Popular" diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml index 07aed4a..cd9442f 100644 --- a/web/html/nav/sitenav-authenticated.xml +++ b/web/html/nav/sitenav-authenticated.xml @@ -101,7 +101,7 @@ <rhn-tab-directory>/network/channels</rhn-tab-directory> <rhn-tab-directory>/network/software/channels</rhn-tab-directory> <rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/> - <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/RedHat.do"/> + <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/Vendor.do"/> <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/> <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/> <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/> -- 1.6.0.2
_______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
