Attachment 311233 Details for Bug 454312 – An experimental patch

[patch] An experimental patch

0001-an-experimental-patch-for-bz-454312-disable-l10n-ed.patch (text/plain), 4.12 KB, created by Satoru SATOH on 2008-07-08 06:41:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoru SATOH

Created: 2008-07-08 06:41:34 UTC

Size: 4.12 KB

patch

obsolete

>From cb0cbcfbd54e08c61c901b4d1be9b2f60e296ba1 Mon Sep 17 00:00:00 2001
>From: Satoru SATOH <satoru.satoh@gmail.com>
>Date: Tue, 8 Jul 2008 15:24:33 +0900
>Subject: [PATCH] an experimental patch for bz#454312; disable l10n-ed advisoryTypes.
>
>---
> .../frontend/action/errata/CreateSetupAction.java  |    1 +
> .../rhn/frontend/action/errata/EditAction.java     |    1 +
> .../redhat/rhn/manager/errata/ErrataManager.java   |   30 ++++++++++++++-----
> 3 files changed, 24 insertions(+), 8 deletions(-)
>
>diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
>index 2cb9d5c..4348dae 100644
>--- a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
>+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
>@@ -50,6 +50,7 @@ public class CreateSetupAction extends RhnAction {
>         
>         //set advisoryTypes list for select drop down
>         request.setAttribute("advisoryTypes", ErrataManager.advisoryTypes());
>+        // request.setAttribute("advisoryTypeLabels", ErrataManager.advisoryTypeLabels());
>         
>         return mapping.findForward("default");
>     }
>diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
>index c00c1e6..880fb34 100644
>--- a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
>+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
>@@ -123,6 +123,7 @@ public class EditAction extends LookupDispatchAction {
>         request.setAttribute("advisory", errata.getAdvisory());
>         //set advisoryTypes list for select drop down
>         request.setAttribute("advisoryTypes", ErrataManager.advisoryTypes());
>+        // request.setAttribute("advisoryTypeLabels", ErrataManager.advisoryTypeLabels());
> 
>         return mapping.findForward("default");
>     }
>diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
>index 92ca958..9778b9a 100644
>--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
>+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
>@@ -701,22 +701,36 @@ public class ErrataManager extends BaseManager {
>         DataResult dr = m.execute(params);
>         return dr;
>     }
>-    
>+
>     /**
>      * Returns a list of advisory types available for an errata
>      * @return advisory types
>      */
>     public static List advisoryTypes() {
>         List advTypes = new ArrayList();
>-        advTypes.add(LocalizationService.getInstance()
>-                         .getMessage("errata.create.bugfixadvisory"));
>-        advTypes.add(LocalizationService.getInstance()
>-                         .getMessage("errata.create.productenhancementadvisory"));
>-        advTypes.add(LocalizationService.getInstance()
>-                         .getMessage("errata.create.securityadvisory"));
>+        LocalizationService ls = LocalizationService.getInstance();
>+        advTypes.add(ls.getMessage("errata.create.bugfixadvisory",
>+                     LocalizationService.DEFAULT_LOCALE));
>+        advTypes.add(ls.getMessage("errata.create.productenhancementadvisory",
>+                     LocalizationService.DEFAULT_LOCALE));
>+        advTypes.add(ls.getMessage("errata.create.securityadvisory",
>+                     LocalizationService.DEFAULT_LOCALE));
>         return advTypes;
>     }
>-    
>+
>+    /**
>+     * Returns a list of l10n-ed advisory types available for an errata
>+     * @return l10n-ed advisory type labels
>+     */
>+    public static List advisoryTypeLabels() {
>+        List advTypeLabels = new ArrayList();
>+        LocalizationService ls = LocalizationService.getInstance();
>+        advTypeLabels.add(ls.getMessage("errata.create.bugfixadvisory"));
>+        advTypeLabels.add(ls.getMessage("errata.create.productenhancementadvisory"));
>+        advTypeLabels.add(ls.getMessage("errata.create.securityadvisory"));
>+        return advTypeLabels;
>+    }
>+
>     /**
>      * Stores an errata to the db
>      * @param errataIn The errata to store.
>-- 
>1.5.6
>

Actions: View | Diff

Attachments on bug 454312: 311233 | 311481