Author: chathura
Date: Fri Jan 25 02:58:08 2008
New Revision: 12892
Log:
Fixed an issue with resource renaming in the UI.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/ajax/entry-list.jsp
Fri Jan 25 02:58:08 2008
@@ -25,7 +25,7 @@
<div class="error-message"><%=errorMessage%></div>
<% } %>
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%"
class="data-table">
+<table cellpadding="0" cellspacing="0" border="0" style="width:100%;"
class="data-table">
<%
if(!collection.getResourceDataList().isEmpty()) {
%>
@@ -40,22 +40,24 @@
<%
}
Iterator iterator = collection.getResourceDataList().iterator();
+ int entryNumber = 0;
while (iterator.hasNext()) {
ResourceData resourceData = (ResourceData) iterator.next();
+ entryNumber++;
%>
<tr id="1">
<td>
- <% if (resourceData.getResourceType() ==
ResourceData.COLLECTION) { %>
- <img
src="/wso2registry/admin/images/icon-folder-small.gif"
style="margin-right:5px;" /><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getName()%></a>
- <% } else { %>
- <div style="margin-left:20px;">
- <a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
id="resourceView"><%=resourceData.getName()%></a>
- <input type="text" id="resourceEdit"
style="display:none" value="<%=resourceData.getName()%>" />
- | <a
href="/wso2registry/resources<%=resourceData.getResourcePath()%>"
target="_blank" title="Download" ><img
src="/wso2registry/admin/images/icon-download.jpg" border="0" align="top" /></a>
- | <a href="#" title="Edit Resource Name"
onclick="showHideCommon('resourceEdit');showHideCommon('resourceView');
showHideCommon('resourceSaveButton');showHideCommon('resourceEditButton');"
id="resourceEditButton"><img src="/wso2registry/admin/images/icon-edit.gif"
border="0" align="top" id="resourceEditButton" /></a>
- <a href="#"
onclick="renameResource('<%=details.getPath()%>',
'<%=resourceData.getResourcePath()%>');showHideCommon('resourceEdit');showHideCommon('resourceView');
showHideCommon('resourceSaveButton');showHideCommon('resourceEditButton');"
id="resourceSaveButton" style="display:none;"><img border="0" align="top"
title="Save" src="/wso2registry/admin/images/save-button.gif" /></a>
- </div>
- <% } %>
+ <% if (resourceData.getResourceType() == ResourceData.COLLECTION)
{ %>
+ <img src="/wso2registry/admin/images/icon-folder-small.gif"
style="margin-right:5px;" /><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getName()%></a>
+ <% } else { %>
+ <div style="margin-left:20px;">
+ <a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
id="resourceView<%=entryNumber%>"><%=resourceData.getName()%></a>
+ <input type="text" id="resourceEdit<%=entryNumber%>"
style="display:none" value="<%=resourceData.getName()%>" />
+ | <a
href="/wso2registry/resources<%=resourceData.getResourcePath()%>"
target="_blank" title="Download" ><img
src="/wso2registry/admin/images/icon-download.jpg" border="0" align="top" /></a>
+ | <a href="#" title="Edit Resource Name"
onclick="showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceEditButton<%=entryNumber%>"><img
src="/wso2registry/admin/images/icon-edit.gif" border="0" align="top"
id="resourceEditButton" /></a>
+ <a href="#" onclick="renameResource('<%=details.getPath()%>',
'<%=resourceData.getResourcePath()%>',
'resourceEdit<%=entryNumber%>');showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceSaveButton<%=entryNumber%>" style="display:none;"><img border="0"
align="top" title="Save" src="/wso2registry/admin/images/save-button.gif"
/></a>
+ </div>
+ <% } %>
</td>
<td><%=resourceData.getCreatedOn()%></td>
<td><%=resourceData.getAuthorUserName()%></td>
@@ -77,5 +79,4 @@
<% } %>
-
</table>
\ No newline at end of file
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Fri Jan
25 02:58:08 2008
@@ -347,9 +347,9 @@
new Ajax.Updater('resourceProperties',
'/wso2registry/system/removeProperty', { method: 'post', parameters:
{resourcePath: resourcePath, propertyName: propertyName} });
}
-function renameResource(parentPath, oldResourcePath) {
+function renameResource(parentPath, oldResourcePath, resourceEditDivID) {
- var newName = document.getElementById('resourceEdit').value;
+ var newName = document.getElementById(resourceEditDivID).value;
new Ajax.Updater('entryList', '/wso2registry/system/renameResource', {
method: 'post', parameters: {parentPath: parentPath, oldResourcePath:
oldResourcePath, newName: newName} });
}
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Fri Jan 25 02:58:08 2008
@@ -391,8 +391,10 @@
<%
}
Iterator iterator = collection.getResourceDataList().iterator();
+ int entryNumber = 0;
while (iterator.hasNext()) {
ResourceData resourceData = (ResourceData) iterator.next();
+ entryNumber++;
%>
<tr id="1">
<td>
@@ -400,11 +402,11 @@
<img
src="/wso2registry/admin/images/icon-folder-small.gif"
style="margin-right:5px;" /><a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"><%=resourceData.getName()%></a>
<% } else { %>
<div style="margin-left:20px;">
- <a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
id="resourceView"><%=resourceData.getName()%></a>
- <input type="text" id="resourceEdit"
style="display:none" value="<%=resourceData.getName()%>" />
+ <a
href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
id="resourceView<%=entryNumber%>"><%=resourceData.getName()%></a>
+ <input type="text" id="resourceEdit<%=entryNumber%>"
style="display:none" value="<%=resourceData.getName()%>" />
| <a
href="/wso2registry/resources<%=resourceData.getResourcePath()%>"
target="_blank" title="Download" ><img
src="/wso2registry/admin/images/icon-download.jpg" border="0" align="top" /></a>
- | <a href="#" title="Edit Resource Name"
onclick="showHideCommon('resourceEdit');showHideCommon('resourceView');
showHideCommon('resourceSaveButton');showHideCommon('resourceEditButton');"
id="resourceEditButton"><img src="/wso2registry/admin/images/icon-edit.gif"
border="0" align="top" id="resourceEditButton" /></a>
- <a href="#"
onclick="renameResource('<%=details.getPath()%>',
'<%=resourceData.getResourcePath()%>');showHideCommon('resourceEdit');showHideCommon('resourceView');
showHideCommon('resourceSaveButton');showHideCommon('resourceEditButton');"
id="resourceSaveButton" style="display:none;"><img border="0" align="top"
title="Save" src="/wso2registry/admin/images/save-button.gif" /></a>
+ | <a href="#" title="Edit Resource Name"
onclick="showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceEditButton<%=entryNumber%>"><img
src="/wso2registry/admin/images/icon-edit.gif" border="0" align="top"
id="resourceEditButton" /></a>
+ <a href="#"
onclick="renameResource('<%=details.getPath()%>',
'<%=resourceData.getResourcePath()%>',
'resourceEdit<%=entryNumber%>');showHideCommon('resourceEdit<%=entryNumber%>');showHideCommon('resourceView<%=entryNumber%>');
showHideCommon('resourceSaveButton<%=entryNumber%>');showHideCommon('resourceEditButton<%=entryNumber%>');"
id="resourceSaveButton<%=entryNumber%>" style="display:none;"><img border="0"
align="top" title="Save" src="/wso2registry/admin/images/save-button.gif"
/></a>
</div>
<% } %>
</td>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
