Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3263] [RHQ-1646] - add fix for uses of hasPrincipal property on the view/edit user pages;
|
From: <jma...@rh...> - 2009-03-01 04:05:21
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3263] [RHQ-1646] - add fix for uses of hasPrincipal property on the view/edit user pages; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3263</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-02-28 22:05:15 -0600 (Sat, 28 Feb 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1646] - add fix for uses of hasPrincipal property on the view/edit user pages; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiadminuserUserAdminPortalActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/user/UserAdminPortalAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiauthenticationAuthenticateUserActionjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyWebUserjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUser.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiadminuserUserAdminPortalActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/user/UserAdminPortalAction.java (3262 => 3263)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/user/UserAdminPortalAction.java 2009-02-28 22:46:40 UTC (rev 3262) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/user/UserAdminPortalAction.java 2009-03-01 04:05:15 UTC (rev 3263) </span><span class="lines">@@ -184,7 +184,7 @@ </span><span class="cx"> boolean hasPrincipal = LookupUtil.getSubjectManager().isUserWithPrincipal(user.getName()); WebUser webUser = new WebUser(user); </span><span class="rem">- //webUser.setHasPrincipal(hasPrincipal); </span><span class="add">+ webUser.setHasPrincipal(hasPrincipal); </span><span class="cx"> request.setAttribute(Constants.USER_ATTR, webUser); request.setAttribute(Constants.TITLE_PARAM_ATTR, BizappUtils.makeSubjectFullName(user)); </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiauthenticationAuthenticateUserActionjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java (3262 => 3263)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java 2009-02-28 22:46:40 UTC (rev 3262) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java 2009-03-01 04:05:15 UTC (rev 3263) </span><span class="lines">@@ -118,7 +118,7 @@ </span><span class="cx"> } } </span><span class="rem">- webUser = new WebUser(subject); </span><span class="add">+ webUser = new WebUser(subject, hasPrincipal); </span><span class="cx"> } catch (Exception e) { String msg = e.getMessage().toLowerCase(); if ((msg.indexOf("username") >= 0) || (msg.indexOf("password") >= 0)) { </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguilegacyWebUserjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUser.java (3262 => 3263)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUser.java 2009-02-28 22:46:40 UTC (rev 3262) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUser.java 2009-03-01 04:05:15 UTC (rev 3263) </span><span class="lines">@@ -37,6 +37,7 @@ </span><span class="cx"> private final Log log = LogFactory.getLog(WebUser.class); private Subject subject; </span><span class="add">+ private boolean hasPrincipal; </span><span class="cx"> public WebUser() { this(null); </span><span class="lines">@@ -44,8 +45,14 @@ </span><span class="cx"> public WebUser(Subject subject) { this.subject = subject; </span><span class="add">+ this.hasPrincipal = false; </span><span class="cx"> } </span><span class="add">+ public WebUser(Subject subject, boolean hasPrincipal) { + this.subject = subject; + this.hasPrincipal = hasPrincipal; + } + </span><span class="cx"> /** * Returns this web user's {@link Subject}. * </span><span class="lines">@@ -174,4 +181,12 @@ </span><span class="cx"> public MeasurementPreferences getMeasurementPreferences() { return new MeasurementPreferences(subject); } </span><span class="add">+ + public boolean isHasPrincipal() { + return hasPrincipal; + } + + public void setHasPrincipal(boolean hasPrincipal) { + this.hasPrincipal = hasPrincipal; + } </span><span class="cx"> } </span> </pre> </div> </div> </body> </html> |