Author: chathura
Date: Fri Dec 21 00:49:46 2007
New Revision: 11646

Log:


Bug fixes. Improvements.



Modified:
   
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
   
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp
   branches/registry/0_1/modules/webapps/src/main/webapp/admin/header.jsp
   branches/registry/0_1/modules/webapps/src/main/webapp/admin/search.jsp

Modified: 
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
==============================================================================
--- 
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
  (original)
+++ 
branches/registry/0_1/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
  Fri Dec 21 00:49:46 2007
@@ -30,7 +30,13 @@
             throws RegistryException {
 
         SecureRegistry secureRegistry = CommonUtil.getUserRegistry(request);
-        if (secureRegistry.resourceExists(path)) {
+
+        String resourcePath = path;
+        if (path.indexOf("?") > 0) {
+            resourcePath = path.substring(0, path.indexOf("?"));
+        }
+
+        if (secureRegistry.resourceExists(resourcePath)) {
             return secureRegistry.get(path);
         } else {
             return null;

Modified: 
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp
==============================================================================
--- 
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp 
    (original)
+++ 
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp 
    Fri Dec 21 00:49:46 2007
@@ -231,8 +231,6 @@
         <th>Created Date</th>
         <th>Author</th>
         <th>Rating</th>
-        <th>Action</th>
-
     </tr>
 
     <%
@@ -253,13 +251,6 @@
             <img 
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[4]%>.gif"  />
             (<%=resourceData.getAverageRating()%>)
         </td>
-        <td>
-            <a href="#" title="Sub Items"><img src="images/icon-subitems.gif" 
border="0" /></a>
-            <a href="#" title="Show Details" style="margin-left:5px;"><img 
src="images/icon-details.gif" border="0" /></a>
-            <a href="#" title="Delete" style="margin-left:5px;"><img 
src="images/icon-trash.gif" border="0" /></a>
-        </td>
-
-
     </tr>
     <tr id="1-des" style="display:none;">
         <td colspan="6" class="table-description">

Modified: branches/registry/0_1/modules/webapps/src/main/webapp/admin/header.jsp
==============================================================================
--- branches/registry/0_1/modules/webapps/src/main/webapp/admin/header.jsp      
(original)
+++ branches/registry/0_1/modules/webapps/src/main/webapp/admin/header.jsp      
Fri Dec 21 00:49:46 2007
@@ -112,13 +112,14 @@
                                                                </a>
                                                        </td>
                             <% } %>
-                            <% if (isLogged) { %>
-                            <td class="top-menu">
-                                                               <a 
href="/wso2registry/system/admin">
-                                                               <img 
src="/wso2registry/admin/images/icon-admin.gif" border="0" align="top"  /> Admin
-                                                               </a>
-                                                       </td>
-                            <% } %>
+                            <!--Add this after figuring out a better way to do 
the config-->
+                            <%--<% if (isLogged) { %>--%>
+                            <!--<td class="top-menu">-->
+                                                               <!--<a 
href="/wso2registry/system/admin">-->
+                                                               <!--<img 
src="/wso2registry/admin/images/icon-admin.gif" border="0" align="top"  /> 
Admin-->
+                                                               <!--</a>-->
+                            <!--</td>-->
+                            <%--<% } %>--%>
                             <td class="top-menu">
                                                                <%
                                                                if 
(userName.equals(RegistryConstants.ANONYMOUS_USER)) {

Modified: branches/registry/0_1/modules/webapps/src/main/webapp/admin/search.jsp
==============================================================================
--- branches/registry/0_1/modules/webapps/src/main/webapp/admin/search.jsp      
(original)
+++ branches/registry/0_1/modules/webapps/src/main/webapp/admin/search.jsp      
Fri Dec 21 00:49:46 2007
@@ -60,8 +60,6 @@
             <th>Created Date</th>
             <th>Author</th>
             <th>Rating</th>
-            <th>Action</th>
-
         </tr>
 
         <%
@@ -82,11 +80,6 @@
                 <img 
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[4]%>.gif"  />
                 (<%=resourceData.getAverageRating()%>)
             </td>
-            <td>
-                <a href="#" title="Sub Items"><img 
src="images/icon-subitems.gif" border="0" /></a>
-                <a href="#" title="Show Details" style="margin-left:5px;"><img 
src="images/icon-details.gif" border="0" /></a>
-                <a href="#" title="Delete" style="margin-left:5px;"><img 
src="images/icon-trash.gif" border="0" /></a>
-            </td>
         </tr>
         <tr id="1-des" style="display:none;">
             <td colspan="6" class="table-description">

_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev

Reply via email to