java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java | 7
+++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c433e664d89fede154400dc0fbffc79702f57f01
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue May 29 10:37:43 2012 +0200
814659 - add an extra entitlement check before the key creation
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
index a230ff1..7ced127 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
@@ -317,15 +317,18 @@ public class ActivationKeyDetailsAction extends RhnAction {
usageLimit = Long.valueOf(daForm.getString(USAGE_LIMIT));
}
+ List<String> selected =
Arrays.asList((String[])daForm.get(SELECTED_ENTS));
+ manager.validateAddOnEntitlements(selected, true);
+
ActivationKey key = manager.createNewActivationKey(user,
daForm.getString(KEY),
daForm.getString(DESCRIPTION),
usageLimit,
lookupChannel(daForm, user),
Boolean.TRUE.equals(daForm.get(ORG_DEFAULT)));
- String[] selected = (String[])daForm.get(SELECTED_ENTS);
+
if (selected != null) {
- manager.addEntitlements(key, Arrays.asList(selected));
+ manager.addEntitlements(key, selected);
}
ActionMessages msg = new ActionMessages();
addToMessage(msg, "activation-key.java.created", key.getNote());
Show replies by date