Attachment 579690 Details for Bug 814836 – patch to show only custom activation keys

[patch] patch to show only custom activation keys

0001-814836-list-only-custom-activation-keys-not-auto-gen.patch (text/plain), 3.38 KB, created by Shannon Hughes on 2012-04-23 20:53:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shannon Hughes

Created: 2012-04-23 20:53:36 UTC

Size: 3.38 KB

patch

obsolete

>From 1c3d54d5740d9f000b156a49ec1d294e66044a4e Mon Sep 17 00:00:00 2001
>From: Shannon Hughes <shughes@redhat.com>
>Date: Mon, 23 Apr 2012 16:50:01 -0400
>Subject: [PATCH] 814836 - list only custom activation keys, not auto-gen
>
>---
> .../rhn/manager/token/ActivationKeyManager.java    |   28 +++++++++++++------
> 1 files changed, 19 insertions(+), 9 deletions(-)
>
>diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java
>index 41e47d2..0b5be3a 100644
>--- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java
>+++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java
>@@ -14,9 +14,11 @@
>  */
> package com.redhat.rhn.manager.token;
> 
>+import com.redhat.rhn.manager.BaseManager;
> import com.redhat.rhn.common.db.datasource.ModeFactory;
> import com.redhat.rhn.common.db.datasource.WriteMode;
>-import com.redhat.rhn.common.hibernate.HibernateFactory;
>+import com.redhat.rhn.common.db.datasource.SelectMode;
>+import com.redhat.rhn.common.db.datasource.DataResult;
> import com.redhat.rhn.common.hibernate.LookupException;
> import com.redhat.rhn.common.localization.LocalizationService;
> import com.redhat.rhn.common.validator.ValidatorError;
>@@ -39,6 +41,7 @@ import com.redhat.rhn.domain.token.ActivationKey;
> import com.redhat.rhn.domain.token.ActivationKeyFactory;
> import com.redhat.rhn.domain.user.User;
> import com.redhat.rhn.frontend.struts.Scrubber;
>+import com.redhat.rhn.frontend.dto.ActivationKeyDto;
> import com.redhat.rhn.manager.channel.ChannelManager;
> import com.redhat.rhn.manager.entitlement.EntitlementManager;
> import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
>@@ -48,7 +51,6 @@ import com.redhat.rhn.manager.system.SystemManager;
> import org.apache.commons.lang.StringUtils;
> import org.apache.log4j.Logger;
> import org.cobbler.Profile;
>-import org.hibernate.Session;
> 
> import java.lang.reflect.Method;
> import java.util.ArrayList;
>@@ -64,7 +66,7 @@ import java.util.Set;
>  * ActivationKeyManager
>  * @version $Rev$
>  */
>-public class ActivationKeyManager {
>+public class ActivationKeyManager extends BaseManager {
>     private static Logger log = Logger.getLogger(ActivationKeyManager.class);
>     private static ActivationKeyManager instance = new ActivationKeyManager();
>     //private constructor
>@@ -327,12 +329,20 @@ public class ActivationKeyManager {
>      * @return All activation keys visible to user.
>      */
>     public List <ActivationKey> findAll(User requester) {
>-        Session session = null;
>-        session = HibernateFactory.getSession();
>-        return session.getNamedQuery("ActivationKey.findByOrg")
>-           .setEntity("org", requester.getOrg())
>-           .setCacheable(true)
>-           .list();
>+        SelectMode m = ModeFactory.getMode("General_queries",
>+                       "activation_keys_for_org");
>+        Map params = new HashMap();
>+        params.put("org_id", requester.getOrg().getId());
>+        DataResult <ActivationKeyDto>  result =
>+                   makeDataResult(params, Collections.EMPTY_MAP, null, m);
>+
>+        List<ActivationKey> keys = new ArrayList<ActivationKey>();
>+        for (Iterator itr = result.iterator(); itr.hasNext();) {
>+          ActivationKeyDto dto = (ActivationKeyDto) itr.next();
>+          keys.add(ActivationKeyFactory.lookupByKey(dto.getToken()));
>+        }
>+
>+        return keys;
>     }
> 
>     /**
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 814836: 579101 | 579690