[Registry-dev] svn commit r16788 - in
trunk/registry/modules/webapps/src/main:
java/org/wso2/registry/web webapp/admin webapp/admin/ajax
webapp/admin/js
svn at wso2.org
svn at wso2.org
Sat May 10 19:45:24 PDT 2008
Author: chanaka
Date: Sat May 10 19:45:23 2008
New Revision: 16788
Log:
activities searching converted in to ajax for pagination to work.
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/activity.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java Sat May 10 19:45:23 2008
@@ -265,7 +265,8 @@
forwardToResources(request, response, path);
}
- }else if (command.equals("/addAspect")) {
+ }
+ else if (command.equals("/addAspect")) {
try {
LifecycleUtil.addAspect(request, response);
@@ -954,11 +955,17 @@
private void forwardToActivity(HttpServletRequest request, HttpServletResponse response) {
RecentActivityAction recentActivityAction = new RecentActivityAction();
- recentActivityAction.setUserName(request.getParameter("userName"));
- recentActivityAction.setResourcePath(request.getParameter("path"));
- recentActivityAction.setFromDate(request.getParameter("fromDate"));
- recentActivityAction.setToDate(request.getParameter("toDate"));
- recentActivityAction.setFilter(request.getParameter("filter"));
+ String userName = request.getParameter("userName");
+ String path = request.getParameter("path");
+ String fromDate = request.getParameter("fromDate");
+ String toDate = request.getParameter("toDate");
+ String filter = request.getParameter("filter");
+
+ recentActivityAction.setUserName(userName);
+ recentActivityAction.setResourcePath(path);
+ recentActivityAction.setFromDate(fromDate);
+ recentActivityAction.setToDate(toDate);
+ recentActivityAction.setFilter(filter);
try {
recentActivityAction.execute(request);
@@ -971,7 +978,7 @@
setAnnouncementsBean(request);
try {
- request.getRequestDispatcher(UIConstants.ACTIVITY_JSP).forward(request, response);
+ request.getRequestDispatcher(UIConstants.ACTIVITY_AJAX_JSP).forward(request, response);
} catch (ServletException e) {
e.printStackTrace();
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/UIConstants.java Sat May 10 19:45:23 2008
@@ -53,6 +53,7 @@
public static final String USER_MANAGEMENT_JSP = "/admin/people.jsp";
public static final String ASSOCIATION_TREE_JSP = "/admin/association-tree.jsp";
public static final String ACTIVITY_JSP = "/admin/recent-activity.jsp";
+ public static final String ACTIVITY_AJAX_JSP = "/admin/ajax/activity.jsp";
public static final String ADMIN_JSP = "/admin/admin.jsp";
public static final String ADVANCED_SEARCH_JSP = "/admin/advanced-search.jsp";
public static final String SEARCH_JSP = "/admin/search.jsp";
Added: trunk/registry/modules/webapps/src/main/webapp/admin/ajax/activity.jsp
==============================================================================
--- (empty file)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/ajax/activity.jsp Sat May 10 19:45:23 2008
@@ -0,0 +1,36 @@
+<%@ page import="org.wso2.registry.web.UIConstants" %>
+<%@ page import="org.wso2.registry.web.actions.RecentActivityAction" %>
+<%@ page import="java.util.Iterator" %>
+<%--
+ Created by IntelliJ IDEA.
+ User: chanaka jayasena
+ Date: May 10, 2008
+ Time: 10:31:20 PM
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+ RecentActivityAction recentActivity = (RecentActivityAction) request.getSession().getAttribute(UIConstants.ACTIVITY_BEAN);
+%>
+<table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="data-table">
+ <%
+ Iterator i = recentActivity.getActivity().iterator();
+ if(!recentActivity.getActivity().isEmpty()){
+ %>
+ <tr>
+ <th>Activities</th>
+
+ </tr>
+
+ <%
+ }
+ while (i.hasNext()) {
+ String activity = (String) i.next();
+ %>
+ <tr>
+ <td><%=activity%></td>
+ </tr>
+
+ <% } %>
+
+ </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 Sat May 10 19:45:23 2008
@@ -750,19 +750,29 @@
function submitActivityForm(){
var reasonDiv=$('activityReason');
var reason="";
-
- if($('fromDate').value!="") reason +=validateDate($('fromDate'),"From");
- if($('toDate').value!="") reason +=validateDate($('toDate'),"To");
- if($('userName').value!="") reason +=validateForInput($('userName'),"Username");
- if($('path').value!="") reason +=validateForInput($('path'),"Path");
- reasonDiv.innerHTML=reason;
+ var fromDate = $('fromDate');
+ var toDate = $('toDate');
+ var userName= $('userName');
+ var path = $('path');
+ var filterElement = document.getElementById('filter');
+ var filter =filterElement.options[filterElement.selectedIndex].value;
+
+ if(fromDate.value!="") reason +=validateDate(fromDate,"From");
+ if(toDate.value!="") reason +=validateDate(toDate,"To");
+ if(userName.value!="") reason +=validateForInput($('userName'),"Username");
+ if(path.value!="") reason +=validateForInput(path,"Path");
+
+
+ reasonDiv.innerHTML=reason;
if(reason!="") {
reasonDiv.style.display="block";
return false;
}
else {
- document.forms["activityForm"].submit();
+
+ new Ajax.Updater('activityList', '/wso2registry/system/activity', { method: 'get', parameters: {fromDate: fromDate.value, toDate: toDate.value, userName:userName.value,path:path.value,filter:filter} });
+ //document.forms["activityForm"].submit();
}
}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp Sat May 10 19:45:23 2008
@@ -110,7 +110,7 @@
<tr>
<td valign="top">Filter by</td>
<td>
- <select name="filter">
+ <select name="filter" id="filter">
<option value ="all">All</option>
<option value ="resourceActions">Resource Updates</option>
<option value ="delete">Resource Deletes</option>
@@ -129,8 +129,9 @@
</table>
</form>
+ <div id="activityList">
<table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="data-table">
- <%
+ <%
Iterator i = recentActivity.getActivity().iterator();
if(!recentActivity.getActivity().isEmpty()){
%>
@@ -151,6 +152,7 @@
<% } %>
</table>
+ </div>
<!-- End box1-mid div -->
More information about the Registry-dev
mailing list