Author: simoneg
Date: Thu Dec 17 11:18:52 2009
New Revision: 891638
URL: http://svn.apache.org/viewvc?rev=891638&view=rev
Log:
User uses nullable booleans
Modified:
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java
Modified:
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java?rev=891638&r1=891637&r2=891638&view=diff
==============================================================================
---
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
(original)
+++
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
Thu Dec 17 11:18:52 2009
@@ -101,14 +101,14 @@
@MagView(order=6, defaultLayer=false)
- public Boolean isActive() {
+ public Boolean getActive() {
return active;
}
public void setActive(Boolean active) {
this.active = active;
}
@MagView(order=7, defaultLayer=false)
- public Boolean isAdmin() {
+ public Boolean getAdmin() {
return admin;
}
public void setAdmin(Boolean admin) {
Modified:
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj?rev=891638&r1=891637&r2=891638&view=diff
==============================================================================
---
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj
(original)
+++
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/AdminOnlyToAdmins.aj
Thu Dec 17 11:18:52 2009
@@ -26,7 +26,7 @@
&& this(handler) {
if (handler.sessionUser == null) return false;
- return (handler.sessionUser.isAdmin() &&
handler.sessionUser.isActive());
+ return (handler.sessionUser.getAdmin() != null &&
handler.sessionUser.getAdmin() && handler.sessionUser.getActive() != null &&
handler.sessionUser.getActive());
}
}
Modified:
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java?rev=891638&r1=891637&r2=891638&view=diff
==============================================================================
---
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java
(original)
+++
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginWebHandler.java
Thu Dec 17 11:18:52 2009
@@ -43,7 +43,7 @@
if (this.sessionUser == null) {
return handleRequest().doShow();
} else {
- if(this.sessionUser.isActive()){
+ if(this.sessionUser.getActive() != null &&
this.sessionUser.getActive()){
return new
TemplatingProducer("loginMenu").addParameter(this.sessionUser);
} else {
return doInactive();
@@ -60,7 +60,7 @@
if (this.sessionUser == null) {
return new TemplatingProducer("smallLogin");
} else {
- if(this.sessionUser.isActive()){
+ if(this.sessionUser.getActive() != null &&
this.sessionUser.getActive()){
return new
TemplatingProducer("smallLoginMenu").addParameter(this.sessionUser);
} else {
return doInactive();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
