Author: vkumar
Date: Mon May 17 11:14:10 2010
New Revision: 945082
URL: http://svn.apache.org/viewvc?rev=945082&view=rev
Log:
Adding null checks in velocity
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm?rev=945082&r1=945081&r2=945082&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/group-details.vm
Mon May 17 11:14:10 2010
@@ -1,9 +1,9 @@
#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -35,7 +35,7 @@ limitations under the License.
<script>
function openWindow(pipeline)
-{
+{
var vWin = window.open(pipeline, "${Target}Picker",
'status=no,resizable=yes,width=200,height=300,scrollbars=yes');
vWin.opener = self;
vWin.focus();
@@ -63,7 +63,7 @@ function openWindow(pipeline)
<tr colspan="2" align="right">
<td nowrap class="portlet-section-alternate"
align="right">$MESSAGES.getString('groupname') </td>
<td class="portlet-section-body" align="left">
- <input type="text" name='group' size="40" value="$!group"
+ <input type="text" name='group' size="40" value="$!group"
class="portlet-form-field-label"
#if ($newGroup == "false") readonly #end
>
@@ -74,12 +74,12 @@ function openWindow(pipeline)
#if ($newGroup == "true")
<input type="submit" name="group.action.Save"
value="$MESSAGES.getString('save')" class="portlet-form-button"/>
#end
-</form>
+</form>
#if ($newGroup == "false")
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
-#set ($tabTarget = $renderResponse.createActionURL())
+#set ($tabTarget = $renderResponse.createActionURL())
#if ($groupTab == "users")
$tabTarget.setParameter("switchTab", "roles")
<td class="LTabLeft" style="font-size:1pt;" nowrap="true"> </td>
@@ -106,7 +106,7 @@ function openWindow(pipeline)
<input type="hidden" name="group" value="$!group">
<input type="submit" id="removeChecked$Targets"
name="group.action.Remove_Checked_$Targets"
value='$MESSAGES.getString("removechecked$targets")' style="display:none"/>
<tr>
-#foreach ($column in $title)
+#foreach ($column in $title)
<th width="10"></th>
<th align='center' class="portlet-section-header" nowrap>
$MESSAGES.getString("$column")
@@ -119,7 +119,7 @@ function openWindow(pipeline)
#set($rowstyle = "portlet-section-body")
#else
#set($rowstyle = "portlet-section-alternate")
-#end
+#end
<td class="$rowstyle" width="10">
<input type="checkbox" name="box_$entry"/>
</td>
@@ -141,17 +141,17 @@ function openWindow(pipeline)
<div align="center">
<form action="$formAction" method="post">
<input type="hidden" name="groupTab" value="$groupTab"/>
- <input type='hidden' name='db.browser.action' value='first' />
+ <input type='hidden' name='db.browser.action' value='first' />
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('firstArrow')">
<input type="hidden" name="start" value="0">
</form>
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
<form action="$renderResponse.createActionURL()" method="post">
<input type="hidden" name="groupTab" value="$groupTab"/>
- <input type='hidden' name='db.browser.action' value='prev'/>
+ <input type='hidden' name='db.browser.action' value='prev'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('prevArrow')">
<input type="hidden" name="start" value="$prev">
</form>
@@ -163,30 +163,30 @@ function openWindow(pipeline)
<input type="hidden" name="groupTab" value="$groupTab"/>
<td valign="middle" height="30">
<div align="center">
- <input type='hidden' name='db.browser.action' value='change'/>
+ <input type='hidden' name='db.browser.action' value='change'/>
<input type="input" name='start' size='5' value="$start"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
+ <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
+ <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
</div>
- </td>
+ </td>
</form>
-
-#end
+
+#end
#if ($next)
<td valign="middle">
<div align="center">
<form action="$formAction" method="post">
<input type="hidden" name="groupTab" value="$groupTab"/>
- <input type='hidden' name='db.browser.action' value='next'/>
+ <input type='hidden' name='db.browser.action' value='next'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('nextArrow')">
<input type="hidden" name="start" value="$next">
</form>
@@ -196,12 +196,12 @@ function openWindow(pipeline)
<div align="center">
<form action="$formAction" method="post">
<input type="hidden" name="groupTab" value="$groupTab"/>
- <input type='hidden' name='db.browser.action' value='last'/>
+ <input type='hidden' name='db.browser.action' value='last'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('lastArrow')">
<input type="hidden" name="start" value="$tableSize">
</form>
</div>
- </td>
+ </td>
#end
#if ($tableSize > 0)
<td valign="middle">
@@ -218,17 +218,17 @@ function openWindow(pipeline)
</table>
<form action="$formAction" method="post">
<input type="hidden" name="groupTab" value="$groupTab"/>
- <input type='hidden' name='db.browser.action' value='search'/>
- <input type='hidden' name='searchColumn' value='1'/>
-
+ <input type='hidden' name='db.browser.action' value='search'/>
+ <input type='hidden' name='searchColumn' value='1'/>
+
<table>
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
<td><input type="text" name="searchString" size="30" value=""
class="portlet-form-field-label"></td>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
- <td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked=1 #end name="filtered"></td>
+ <td style="vertical-align:middle"><input type="checkbox" #if($filtered &&
$filtered == "on") checked=1 #end name="filtered"></td>
</tr>
- </table>
+ </table>
</form>
@@ -241,15 +241,15 @@ function openWindow(pipeline)
</td>
<td>
<input onclick="javascript:openWindow('$popupChooser')" type="button"
name="group.action.Add_${Targets}_To_Group"
value='$MESSAGES.getString("add${targets}togroup")' class="portlet-form-button"
/>
- </td>
-#if ($tableSize > 0)
+ </td>
+#if ($tableSize > 0)
<td>
<input type="button"
onclick="javascript:document.forms.${targets}InGroupForm.removeChecked${Targets}.click()"
value='$MESSAGES.getString("removechecked$targets")'
class="portlet-form-button" />
- </td>
+ </td>
#end
<td>
<input type="submit" name="group.action.Remove_Group"
value="$MESSAGES.getString('removegroup')" class="portlet-form-button" />
- </td>
+ </td>
</tr>
</table>
<input type='hidden' name="${targets}"/>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm?rev=945082&r1=945081&r2=945082&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/groups/groups-view.vm
Mon May 17 11:14:10 2010
@@ -14,8 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
*#
-<script language='JavaScript' src='/idtb/scripts/idtb.js'></script>
-
#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
#set ($formAction = $renderResponse.createActionURL())
@@ -29,7 +27,7 @@
<table cellpadding=0 cellspacing=1 border=0 width='100%' >
<tr>
<th width='12'></th>
- #foreach ($column in $title)
+ #foreach ($column in $title)
<th align='center' class="portlet-section-header" width="100%" nowrap>
$MESSAGES.getString("$column")
</th>
@@ -41,17 +39,17 @@
#set($rowstyle = "portlet-section-body")
#else
#set($rowstyle = "portlet-section-alternate")
- #end
+ #end
#set ($action = $renderResponse.createActionURL())
- $action.setParameter("group", $group)
- #if ($selected == $group)
+ $action.setParameter("group", $group)
+ #if ($selected && $selected == $group)
<td class="$rowstyle" nowrap width='12'>
<img src="/j2-admin/images/selected.gif" />
- </td>
+ </td>
#else
<td class="$rowstyle" nowrap width='12'>
- </td>
+ </td>
#end
<td class="$rowstyle" nowrap width="100%">
<div align="center"><a href='$action'>$group</a></div>
@@ -69,16 +67,16 @@
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='first' />
+ <input type='hidden' name='db.browser.action' value='first' />
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('firstArrow')">
<input type="hidden" name="start" value="0">
</form>
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='prev'/>
+ <input type='hidden' name='db.browser.action' value='prev'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('prevArrow')">
<input type="hidden" name="start" value="$prev">
</form>
@@ -89,30 +87,30 @@
<form action="$formAction" method="post">
<td valign="middle" height="30">
<div align="center">
- <input type='hidden' name='db.browser.action' value='change'/>
+ <input type='hidden' name='db.browser.action' value='change'/>
<input type="input" name='start' size='5' value="$start"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
+ <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
+ <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
</div>
- </td>
+ </td>
</form>
-
- #end
+
+ #end
#if ($next)
<td valign="middle">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='next'/>
+ <input type='hidden' name='db.browser.action' value='next'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('nextArrow')">
<input type="hidden" name="start" value="$next">
</form>
@@ -121,12 +119,12 @@
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='last'/>
+ <input type='hidden' name='db.browser.action' value='last'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('lastArrow')">
<input type="hidden" name="start" value="$tableSize">
</form>
</div>
- </td>
+ </td>
#end
#if ($tableSize > 0)
<td valign="middle">
@@ -141,9 +139,9 @@
</tr>
</table>
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='search'/>
- <input type='hidden' name='searchColumn' value='1'/>
-
+ <input type='hidden' name='db.browser.action' value='search'/>
+ <input type='hidden' name='searchColumn' value='1'/>
+
<table>
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
@@ -151,7 +149,7 @@
</tr>
<tr>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
- <td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked=1 #end name="filtered"></td>
+ <td style="vertical-align:middle"><input type="checkbox" #if($filtered &&
$filtered == "on") checked=1 #end name="filtered"></td>
</tr>
- </table>
+ </table>
</form>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm?rev=945082&r1=945081&r2=945082&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
Mon May 17 11:14:10 2010
@@ -1,9 +1,9 @@
#*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -24,7 +24,7 @@ limitations under the License.
<script>
function openWindow(pipeline)
-{
+{
var vWinUsers = window.open(pipeline, 'UserPicker',
'status=no,resizable=yes,width=200,height=300,scrollbars=yes');
vWinUsers.opener = self;
vWinUsers.focus();
@@ -51,7 +51,7 @@ function openWindow(pipeline)
<tr colspan="2" align="right">
<td nowrap class="portlet-section-alternate"
align="right">$MESSAGES.getString('rolename') </td>
<td class="portlet-section-body" align="left">
- <input type="text" name='role' size="40" value="$!role"
+ <input type="text" name='role' size="40" value="$!role"
class="portlet-form-field-label"
#if ($newRole == "false") readonly #end
>
@@ -62,7 +62,7 @@ function openWindow(pipeline)
#if ($newRole == "true")
<input type="submit" name="role.action.Save"
value="$MESSAGES.getString('save')" class="portlet-form-button"/>
#end
-</form>
+</form>
#if ($newRole == "false")
<form name='usersInRoleForm' action="$formAction" method="post">
@@ -70,7 +70,7 @@ function openWindow(pipeline)
<input type="hidden" name="role" value="$!role">
<input type="submit" id="removeCheckedUsers"
name="role.action.Remove_Checked_Users"
value="$MESSAGES.getString('removecheckedusers')" style="display:none"/>
<tr>
- #foreach ($column in $title)
+ #foreach ($column in $title)
<th width="10"></th>
<th align='center' class="portlet-section-header" nowrap width="100%">
$MESSAGES.getString("$column")
@@ -83,7 +83,7 @@ function openWindow(pipeline)
#set($rowstyle = "portlet-section-body")
#else
#set($rowstyle = "portlet-section-alternate")
- #end
+ #end
<td class="$rowstyle" width="10">
<input type="checkbox" name="box_$user"/>
</td>
@@ -104,16 +104,16 @@ function openWindow(pipeline)
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='first' />
+ <input type='hidden' name='db.browser.action' value='first' />
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('firstArrow')">
<input type="hidden" name="start" value="0">
</form>
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
<form action="$renderResponse.createActionURL()" method="post">
- <input type='hidden' name='db.browser.action' value='prev'/>
+ <input type='hidden' name='db.browser.action' value='prev'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('prevArrow')">
<input type="hidden" name="start" value="$prev">
</form>
@@ -124,29 +124,29 @@ function openWindow(pipeline)
<form action="$formAction" method="post">
<td valign="middle" height="30">
<div align="center">
- <input type='hidden' name='db.browser.action' value='change'/>
+ <input type='hidden' name='db.browser.action' value='change'/>
<input type="input" name='start' size='5' value="$start"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
+ <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
+ <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
</div>
- </td>
+ </td>
</form>
-
- #end
+
+ #end
#if ($next)
<td valign="middle">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='next'/>
+ <input type='hidden' name='db.browser.action' value='next'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('nextArrow')">
<input type="hidden" name="start" value="$next">
</form>
@@ -155,12 +155,12 @@ function openWindow(pipeline)
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='last'/>
+ <input type='hidden' name='db.browser.action' value='last'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('lastArrow')">
<input type="hidden" name="start" value="$tableSize">
</form>
</div>
- </td>
+ </td>
#end
#if ($tableSize > 0)
<td valign="middle">
@@ -175,17 +175,17 @@ function openWindow(pipeline)
</tr>
</table>
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='search'/>
- <input type='hidden' name='searchColumn' value='1'/>
-
+ <input type='hidden' name='db.browser.action' value='search'/>
+ <input type='hidden' name='searchColumn' value='1'/>
+
<table>
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
<td><input type="text" name="searchString" size="30" value=""
class="portlet-form-field-label"></td>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
- <td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked="1" #end name="filtered"></td>
+ <td style="vertical-align:middle"><input type="checkbox" #if($filtered &&
$filtered == "on") checked="1" #end name="filtered"></td>
</tr>
- </table>
+ </table>
</form>
<form name="securityform" action="$formAction" method="post">
@@ -196,15 +196,15 @@ function openWindow(pipeline)
</td>
<td>
<input type="button" onclick="javascript:openWindow('$userChooser')"
name="role.action.Add_Users_To_Role"
value="$MESSAGES.getString('adduserstorole')" class="portlet-form-button" />
- </td>
-#if ($tableSize > 0)
+ </td>
+#if ($tableSize > 0)
<td>
<input type="button"
onclick="javascript:document.forms.usersInRoleForm.removeCheckedUsers.click()"
value="$MESSAGES.getString('removecheckedusers')" class="portlet-form-button" />
- </td>
+ </td>
#end
<td>
<input type="submit" name="role.action.Remove_Role"
value="$MESSAGES.getString('removerole')" class="portlet-form-button" />
- </td>
+ </td>
</tr>
</table>
<input type='hidden' name='users'/>
@@ -214,4 +214,3 @@ function openWindow(pipeline)
#end
-
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm?rev=945082&r1=945081&r2=945082&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
Mon May 17 11:14:10 2010
@@ -29,7 +29,7 @@
<table cellpadding=0 cellspacing=1 border=0 width='100%' >
<tr>
<th width='12'></th>
- #foreach ($column in $title)
+ #foreach ($column in $title)
<th align='center' class="portlet-section-header" width="100%" nowrap>
$MESSAGES.getString("$column")
</th>
@@ -41,17 +41,17 @@
#set($rowstyle = "portlet-section-body")
#else
#set($rowstyle = "portlet-section-alternate")
- #end
+ #end
#set ($action = $renderResponse.createActionURL())
- $action.setParameter("role", $role)
- #if ($selected == $role)
+ $action.setParameter("role", $role)
+ #if ($selected && $selected == $role)
<td class="$rowstyle" nowrap width='12'>
<img src="/j2-admin/images/selected.gif" />
- </td>
+ </td>
#else
<td class="$rowstyle" nowrap width='12'>
- </td>
+ </td>
#end
<td class="$rowstyle" nowrap width="100%">
<div align="center"><a href='$action'>$role</a></div>
@@ -69,16 +69,16 @@
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='first' />
+ <input type='hidden' name='db.browser.action' value='first' />
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('firstArrow')">
<input type="hidden" name="start" value="0">
</form>
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='prev'/>
+ <input type='hidden' name='db.browser.action' value='prev'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('prevArrow')">
<input type="hidden" name="start" value="$prev">
</form>
@@ -89,30 +89,30 @@
<form action="$formAction" method="post">
<td valign="middle" height="30">
<div align="center">
- <input type='hidden' name='db.browser.action' value='change'/>
+ <input type='hidden' name='db.browser.action' value='change'/>
<input type="input" name='start' size='5' value="$start"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
+ <input type="input" readonly size='10'
value="$MESSAGES.getString('numberseparator') $tableSize"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
+ <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
</div>
- </td>
+ </td>
</form>
-
- #end
+
+ #end
#if ($next)
<td valign="middle">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='next'/>
+ <input type='hidden' name='db.browser.action' value='next'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('nextArrow')">
<input type="hidden" name="start" value="$next">
</form>
@@ -121,12 +121,12 @@
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='last'/>
+ <input type='hidden' name='db.browser.action' value='last'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('lastArrow')">
<input type="hidden" name="start" value="$tableSize">
</form>
</div>
- </td>
+ </td>
#end
#if ($tableSize > 0)
<td valign="middle">
@@ -141,9 +141,9 @@
</tr>
</table>
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='search'/>
- <input type='hidden' name='searchColumn' value='1'/>
-
+ <input type='hidden' name='db.browser.action' value='search'/>
+ <input type='hidden' name='searchColumn' value='1'/>
+
<table>
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
@@ -151,7 +151,7 @@
</tr>
<tr>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
- <td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked=1 #end name="filtered"></td>
+ <td style="vertical-align:middle"><input type="checkbox" #if($filtered &&
$filtered == "on") checked=1 #end name="filtered"></td>
</tr>
- </table>
+ </table>
</form>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm?rev=945082&r1=945081&r2=945082&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
Mon May 17 11:14:10 2010
@@ -36,7 +36,7 @@ limitations under the License.
<table cellpadding=0 cellspacing=1 border=0 width='100%' >
<tr>
<th width='12'></th>
- #foreach ($column in $title)
+ #foreach ($column in $title)
<th align='center' class="portlet-section-header" width="100%" nowrap>
$MESSAGES.getString("$column")
</th>
@@ -48,17 +48,17 @@ limitations under the License.
#set($rowstyle = "portlet-section-body")
#else
#set($rowstyle = "portlet-section-alternate")
- #end
+ #end
#set ($action = $renderResponse.createActionURL())
- $action.setParameter("user", $user)
- #if ($selected == $user)
+ $action.setParameter("user", $user)
+ #if ($selected && $selected == $user)
<td class="$rowstyle" nowrap width='12'>
<img src="/j2-admin/images/selected.gif" />
- </td>
+ </td>
#else
<td class="$rowstyle" nowrap width='12'>
- </td>
+ </td>
#end
<td class="$rowstyle" nowrap width="100%">
<div align="center"><a href='$action'>$user</a></div>
@@ -75,24 +75,24 @@ limitations under the License.
<form action="$formAction" method="post">
<td valign="middle" height="30">
<div align="center">
- <input type='hidden' name='db.browser.action' value='change'/>
+ <input type='hidden' name='db.browser.action' value='change'/>
<input type="input" name='start' size='5' value="$start"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input type="input" readonly size='10'
value="$MESSAGES.getString('numsepa') $tableSize"
class="portlet-form-field-label">
+ <input type="input" readonly size='10'
value="$MESSAGES.getString('numsepa') $tableSize"
class="portlet-form-field-label">
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
- <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
+ <input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('go')">
</div>
- </td>
+ </td>
</form>
</table>
-#end
+#end
<table border="0" cellspacing="0" cellpadding="0" align="center">
<tr>
@@ -100,16 +100,16 @@ limitations under the License.
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='first' />
+ <input type='hidden' name='db.browser.action' value='first' />
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('firstarrow')">
<input type="hidden" name="start" value="0">
</form>
</div>
- </td>
+ </td>
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='prev'/>
+ <input type='hidden' name='db.browser.action' value='prev'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('prevarrow')">
<input type="hidden" name="start" value="$prev">
</form>
@@ -120,7 +120,7 @@ limitations under the License.
<td valign="middle">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='next'/>
+ <input type='hidden' name='db.browser.action' value='next'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('nextarrow')">
<input type="hidden" name="start" value="$next">
</form>
@@ -129,12 +129,12 @@ limitations under the License.
<td valign="middle" height="30">
<div align="center">
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='last'/>
+ <input type='hidden' name='db.browser.action' value='last'/>
<input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('lastarrow')">
<input type="hidden" name="start" value="$tableSize">
</form>
</div>
- </td>
+ </td>
#end
#if ($tableSize > 0)
<td valign="middle">
@@ -149,9 +149,9 @@ limitations under the License.
</tr>
</table>
<form action="$formAction" method="post">
- <input type='hidden' name='db.browser.action' value='search'/>
- <input type='hidden' name='searchColumn' value='1'/>
-
+ <input type='hidden' name='db.browser.action' value='search'/>
+ <input type='hidden' name='searchColumn' value='1'/>
+
<table>
<tr>
<td><input class="portlet-form-button" type="submit"
value="$MESSAGES.getString('search')"></td>
@@ -159,7 +159,7 @@ limitations under the License.
</tr>
<tr>
<td nowrap align="right"
style="vertical-align:middle"> $MESSAGES.getString('filter')</td>
- <td style="vertical-align:middle"><input type="checkbox" #if($filtered ==
"on") checked=1 #end name="filtered"></td>
+ <td style="vertical-align:middle"><input type="checkbox" #if($filtered &&
$filtered == "on") checked=1 #end name="filtered"></td>
</tr>
- </table>
+ </table>
</form>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
