litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r8729, r8746 from the release 1.3 maintenance branch

Browse source
This commit is contained in:
j2blake 2011-07-20 16:06:19 +00:00
parent 5ff4bc5d6d
commit 5de98569bf
7 changed files with 167 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
View file

@ -147,11 +147,19 @@
<#list accounts as account>
<tr>
<td>
<input type="checkbox" name="deleteAccount" value="${account.uri}" />
<!-- ignored unless submit action is formUrls.delete -->
<#if account.deletable>
<input type="checkbox" name="deleteAccount" value="${account.uri}" />
<!-- ignored unless submit action is formUrls.delete -->
<#else>
<input type="checkbox" name="deleteAccount" value="${account.uri}" disabled />
</#if>
<a href="${account.editUrl}" >${account.emailAddress}</a>
<!-- when this link is clicked, editAccount is noticed and all other fields are ignored. -->
<#if account.editUrl != "">
<a href="${account.editUrl}" >${account.emailAddress}</a>
<!-- when this link is clicked, editAccount is noticed and all other fields are ignored. -->
<#else>
${account.emailAddress}
</#if>
</td>
<td>${account.firstName}</td>
<td>${account.lastName}</td>