java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 4
+--
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java | 2
-
java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java | 12
+++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 37c5a382a4f5d152fce0d26bbcf4a0caa341f531
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 18 10:22:35 2013 +0200
1007998 - fix activation key selection
'disabled' key conflicted with 'disabled' selectable item
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index a43dd5b..ec35dc1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -204,7 +204,7 @@ ORDER BY SEV.label
<mode name="activation_keys_for_org"
class="com.redhat.rhn.frontend.dto.ActivationKeyDto">
<query params="org_id">
SELECT DISTINCT RT.id,
- RT.disabled,
+ RT.disabled AS key_disabled,
RT.note,
AK.token,
RT.usage_limit,
@@ -228,7 +228,7 @@ ORDER BY RT.note, RT.id
<mode name="active_activation_keys_for_org"
class="com.redhat.rhn.frontend.dto.ActivationKeyDto">
<query params="org_id">
SELECT DISTINCT RT.id,
- RT.disabled,
+ RT.disabled AS key_disabled,
RT.note,
AK.token,
RT.usage_limit,
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
index a69cb7c..ba0b931 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
@@ -76,7 +76,7 @@ public class ActivationKeysListAction extends RhnAction {
if (!context.isSubmitted()) {
set.clear();
for (ActivationKeyDto dto : dataSet) {
- if (!dto.isDisabled()) {
+ if (!dto.isKeyDisabled()) {
set.addElement(dto.getId().longValue());
}
if (dto.isOrgDefault()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
index 8f836ff..d9887e5 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.BooleanUtils;
public class ActivationKeyDto extends BaseDto {
private Long id;
- private boolean disabled;
+ private boolean keyDisabled;
private String note;
private String token;
private Integer usageLimit;
@@ -55,20 +55,20 @@ public class ActivationKeyDto extends BaseDto {
* Is the key disabled?
* @return Returns true if disabled, false if enabled.
*/
- public boolean isDisabled() {
- return disabled;
+ public boolean isKeyDisabled() {
+ return keyDisabled;
}
/**
* Disable (or enable) the key
* @param value 1 if the key is disabled
*/
- public void setDisabled(Integer value) {
+ public void setKeyDisabled(Integer value) {
if (value == null || (!value.equals(new Integer(1)))) {
- this.disabled = false;
+ this.keyDisabled = false;
}
else {
- this.disabled = true;
+ this.keyDisabled = true;
}
return;
Show replies by date