Author: psharples
Date: Mon Sep 24 10:59:57 2012
New Revision: 1389290
URL: http://svn.apache.org/viewvc?rev=1389290&view=rev
Log:
Added api call to retrieve all widgets
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java?rev=1389290&r1=1389289&r2=1389290&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/WidgetApi.java
Mon Sep 24 10:59:57 2012
@@ -20,7 +20,9 @@
package org.apache.rave.portal.web.api.rpc;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.WidgetMetadataResolver;
+import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.api.rpc.model.RpcOperation;
import org.apache.rave.portal.web.api.rpc.model.RpcResult;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +44,12 @@ import java.util.Map;
public class WidgetApi {
private Map<String, WidgetMetadataResolver> widgetMetadataResolverMap;
+
+ private WidgetService widgetService;
@Autowired
- public WidgetApi(List<WidgetMetadataResolver> widgetMetadataResolvers) {
+ public WidgetApi(List<WidgetMetadataResolver> widgetMetadataResolvers,
WidgetService widgetService) {
+ this.widgetService = widgetService;
widgetMetadataResolverMap = new HashMap<String,
WidgetMetadataResolver>();
for (WidgetMetadataResolver widgetMetadataResolver :
widgetMetadataResolvers) {
widgetMetadataResolverMap.put(widgetMetadataResolver.getSupportedContext(),
widgetMetadataResolver);
@@ -80,4 +85,21 @@ public class WidgetApi {
}
}.getResult();
}
+
+ @ResponseBody
+ @RequestMapping(method = RequestMethod.GET, value = "getall")
+ public RpcResult<SearchResult<Widget>> getAllWidgets(){
+ return new RpcOperation<SearchResult<Widget>>() {
+ @Override
+ public SearchResult<Widget> execute() {
+ SearchResult<Widget> results = widgetService.getAllWidgets();
+ // strip out the owner and tag info
+ for(Widget widget : results.getResultSet()){
+ widget.setOwner(null);
+ widget.setTags(null);
+ }
+ return results;
+ }
+ }.getResult();
+ }
}
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js?rev=1389290&r1=1389289&r2=1389290&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
Mon Sep 24 10:59:57 2012
@@ -427,6 +427,20 @@ rave.api = rave.api || (function() {
}).error(handleError);
}
+ function getAllWidgets(args){
+ $.get(rave.getContext() + path + "widget/getall",
+ function(result) {
+ if (result.error) {
+ handleRpcError(result);
+ }
+ else {
+ if (typeof args.successCallback == 'function') {
+ args.successCallback(result);
+ }
+ }
+ }).error(handleError);
+ }
+
function getUsers(args){
var offset = args.offset;
$.get(rave.getContext() + path + "users/get",
@@ -618,7 +632,8 @@ rave.api = rave.api || (function() {
removeFriend : removeFriend,
getFriends : getFriends,
acceptFriendRequest : acceptFriendRequest,
- addWidgetFromMarketplace : addWidgetFromMarketplace
+ addWidgetFromMarketplace : addWidgetFromMarketplace,
+ getAllWidgets : getAllWidgets
};
})();
