Author: chathura
Date: Thu Dec 20 09:27:14 2007
New Revision: 11615
Log:
Fixed a bug in tag searches.
Removed versions section from normal resource view.
Blocked anonymous users from rating resources.
Modified:
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
==============================================================================
---
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
(original)
+++
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/actions/SearchAction.java
Thu Dec 20 09:27:14 2007
@@ -55,7 +55,6 @@
if (tag != null && tag.length() != 0) {
TaggedResourcePath[] taggedPaths =
registry.getResourcePathsWithTag(tag);
- //childPaths = new String[taggedPaths.length];
for (int i = 0; i < taggedPaths.length; i++) {
String resultPath = taggedPaths[i].getResourcePath();
@@ -63,8 +62,12 @@
resourceData.setResourcePath(resultPath);
if (resultPath != null) {
- String[] parts =
resultPath.split(RegistryConstants.PATH_SEPARATOR);
- resourceData.setName(parts[parts.length - 1]);
+ if (resultPath.equals(RegistryConstants.ROOT_PATH)) {
+ resourceData.setName(RegistryConstants.ROOT_PATH);
+ } else {
+ String[] parts =
resultPath.split(RegistryConstants.PATH_SEPARATOR);
+ resourceData.setName(parts[parts.length - 1]);
+ }
}
try {
@@ -85,55 +88,7 @@
resourceDataList.add(resourceData);
}
-
- } else {
-
- //Resource resource;
- //try {
- // resource = registry.get(queryPath);
- //} catch (AuthorizationFailedException e) {
- // status = "error";
- // errorMessage = "User " + getUserName() +
- // " does not have permission to browse this
collection.";
- // return ERROR;
- //}
- //
- //if (resource == null) {
- // status = "error";
- // errorMessage = "Requested collection at queryPath " +
queryPath + " does not exists.";
- // return ERROR;
- //}
- //
- //childPaths = (String[]) resource.getContent();
- }
-
- //for (int i = 0; i < childPaths.length; i++) {
- //
- // ResourceData resourceData = new ResourceData();
- // resourceData.setResourcePath(childPaths[i]);
- //
- // if (childPaths[i] != null) {
- // String[] parts =
childPaths[i].split(RegistryConstants.PATH_SEPARATOR);
- // resourceData.setName(parts[parts.length - 1]);
- // }
- //
- // try {
- // Resource child = registry.get(childPaths[i]);
- //
- // resourceData.setResourceType(
- // child.isDirectory()? ResourceData.COLLECTION :
ResourceData.RESOURCE);
- // resourceData.setAuthorUserName(child.getAuthorUserName());
- // resourceData.setDescription(child.getDescription());
- //
resourceData.setAverageRating(registry.getAverageRating(child.getPath()));
- // resourceData.setCreatedOn(child.getCreatedTime());
- //
- // } catch (AuthorizationFailedException e) {
- //
- // resourceData.setResourceType(ResourceData.UNKNOWN);
- // }
- //
- // resourceDataList.add(resourceData);
- //}
+ }
status = "success";
return SUCCESS;
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
==============================================================================
--- branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
(original)
+++ branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
Thu Dec 20 09:27:14 2007
@@ -11,38 +11,16 @@
<%
AjaxRatingAction ajaxRatingAction = (AjaxRatingAction)
request.getSession().getAttribute(UIConstants.AJAX_RATING_BEAN);
- //String averageRating = new
Float(ajaxRatingAction.getAverageRating()).toString();
- //String userRating = new
Integer(ajaxRatingAction.getUserRating()).toString();
-
- //String path = request.getParameter("path");
- //String ratingDivUserId = request.getParameter("ratingDivUserId");
-
float averageRating = ajaxRatingAction.getAverageRating();
String[] userStars = ajaxRatingAction.getUserStars();
String[] averageStars = ajaxRatingAction.getAverageStars();
- //String userStar;
- //String averageStar;
- //String[] stars = new String[5];
- //for (int i = 1; i <= 5; i++) {
- // if (rating < i) userStar = "0";
- // else userStar = "4";
- //
- // if (averageRating >= i - 0.125) averageStar = "4";
- // else if (averageRating >= i - 0.375) averageStar = "3";
- // else if (averageRating >= i - 0.625) averageStar = "2";
- // else if (averageRating >= i - 0.875) averageStar = "1";
- // else averageStar = "0";
- //
- // stars[i - 1] = userStar + averageStar;
- //}
-
-
%>
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table">
+<% if (ajaxRatingAction.isLoggedIn()) { %>
<tr>
<th valign="top" style="width:140px;">User Rating:</th>
<td>
@@ -74,6 +52,7 @@
<th></th>
<td></td>
</tr>
+<% } %>
<tr>
<th valign="top">Avarage Rating:</th>
<td>
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
---
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Thu Dec 20 09:27:14 2007
@@ -119,6 +119,7 @@
<table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table">
<tr><th style="width:140px;">Created:</th><td
style="width:170px;"><%=details.getCreatedOn().toString()%></td><th>Author:</th><td><%=details.getAuthor()%></td></tr>
<tr><th>Last
Updated:</th><td><%=details.getLastModified().toString()%></td><th>By:</th><td><%=details.getLastUpdater()%></td></tr>
+ <tr><td colspan="4"><a
href="/wso2registry/versions<%=details.getPath()%>">View versions</a></td> </tr>
</table>
<div id="ratingDiv"><img src="/wso2registry/admin/images/ajax-loader.gif"
/></div>
<table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table">
@@ -538,60 +539,60 @@
<!-- Version box starts -->
<!-- Hear comes the box2 table -->
-<div class="box2-head">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%">
- <tr>
- <td valign="top" style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box2-lefttop.jpg" /></td>
- <td valign="top"><h2>Versions</h2></td>
- <td align="right" valign="top">
- <a href="#"
onclick="showHideCommon('versionsIconExpanded');showHideCommon('versionsIconMinimized');showHideCommon('versionsExpanded');showHideCommon('versionsMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif"
border="0" align="top" id="versionsIconExpanded" style="display:none;" />
- <img src="/wso2registry/admin/images/icon-minimized.gif"
border="0" align="top" id="versionsIconMinimized" />
- </a>
- </td>
- <td valign="top" align="right" style="width:14px;
padding-top:0px;" ><img src="/wso2registry/admin/images/box2-righttop.jpg"
/></td>
- </tr>
- </table>
-</div>
-<div class="box2-mid" id="versionsMinimized">
- <a href="/wso2registry/versions<%=details.getPath()%>">View versions</a>
-</div>
-<div class="box2-mid" id="versionsExpanded" style="display:none;">
-
- <%
- Iterator iVersions = details.getVersionPaths().iterator();
- while (iVersions.hasNext()) {
- VersionPath versionPath = (VersionPath) iVersions.next();
- %>
-
- <h3>Version <%=versionPath.getVersionNumber()%></h3>
-
- <strong style="color:#696969;">Last Modified:</strong><br>
- <%=versionPath.getUpdatedOn().toString()%>
- <br><strong style="color:#696969;">By:</strong>
<%=versionPath.getUpdater()%>
- <br>
- <div style="margin-bottom:10px;">
- <a href="/wso2registry/web<%=versionPath.getCompleteVersionPath()%>"
title="Details">Details <img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a>
- <a href="#" title="Restore" style="margin-left:5px;">Restore <img
src="/wso2registry/admin/images/icon-restore.gif" border="0" /></a>
- </div>
-
-
- <% } %>
-</div>
-<div class="box2-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box2-leftbot.jpg" /></td>
- <td align="right"><img
src="/wso2registry/admin/images/box2-rightbot.jpg" /></td>
- </tr>
- </table>
-</div>
-
-</td>
-
-</tr>
-</table>
-</div>
+<%--<div class="box2-head">--%>
+ <%--<table cellspacing="0" cellpadding="0" border="0"
style="width:100%">--%>
+ <%--<tr>--%>
+ <%--<td valign="top" style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box2-lefttop.jpg" /></td>--%>
+ <%--<td valign="top"><h2>Versions</h2></td>--%>
+ <%--<td align="right" valign="top">--%>
+ <%--<a href="#"
onclick="showHideCommon('versionsIconExpanded');showHideCommon('versionsIconMinimized');showHideCommon('versionsExpanded');showHideCommon('versionsMinimized');">--%>
+ <%--<img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="versionsIconExpanded" style="display:none;" />--%>
+ <%--<img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="versionsIconMinimized" />--%>
+ <%--</a>--%>
+ <%--</td>--%>
+ <%--<td valign="top" align="right" style="width:14px;
padding-top:0px;" ><img src="/wso2registry/admin/images/box2-righttop.jpg"
/></td>--%>
+ <%--</tr>--%>
+ <%--</table>--%>
+<%--</div>--%>
+<%--<div class="box2-mid" id="versionsMinimized">--%>
+ <%--<a href="/wso2registry/versions<%=details.getPath()%>">View
versions</a>--%>
+<%--</div>--%>
+<%--<div class="box2-mid" id="versionsExpanded" style="display:none;">--%>
+
+ <%--<%--%>
+ <%--Iterator iVersions = details.getVersionPaths().iterator();--%>
+ <%--while (iVersions.hasNext()) {--%>
+ <%--VersionPath versionPath = (VersionPath) iVersions.next();--%>
+ <%--%>--%>
+
+ <%--<h3>Version <%=versionPath.getVersionNumber()%></h3>--%>
+
+ <%--<strong style="color:#696969;">Last Modified:</strong><br>--%>
+ <%--<%=versionPath.getUpdatedOn().toString()%>--%>
+ <%--<br><strong style="color:#696969;">By:</strong>
<%=versionPath.getUpdater()%>--%>
+ <%--<br>--%>
+ <%--<div style="margin-bottom:10px;">--%>
+ <%--<a
href="/wso2registry/web<%=versionPath.getCompleteVersionPath()%>"
title="Details">Details <img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a>--%>
+ <%--<a href="#" title="Restore" style="margin-left:5px;">Restore <img
src="/wso2registry/admin/images/icon-restore.gif" border="0" /></a>--%>
+ <%--</div>--%>
+
+
+ <%--<% } %>--%>
+<%--</div>--%>
+<%--<div class="box2-bot">--%>
+ <%--<table cellspacing="0" cellpadding="0" border="0" style="width:100%"
>--%>
+ <%--<tr>--%>
+ <%--<td><img src="/wso2registry/admin/images/box2-leftbot.jpg"
/></td>--%>
+ <%--<td align="right"><img
src="/wso2registry/admin/images/box2-rightbot.jpg" /></td>--%>
+ <%--</tr>--%>
+ <%--</table>--%>
+<%--</div>--%>
+
+<%--</td>--%>
+
+<%--</tr>--%>
+<%--</table>--%>
+<%--</div>--%>
<!-- START footer content -->
<jsp:include page="footer.jsp" />
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
