Author: ivol37 at gmail.com
Date: Fri Nov 26 12:09:22 2010
New Revision: 448
Log:
[AMDATU-76] Moves securetoken to metadata field and updated dashboard.jsp to
use the minified jquery dashboard plugin
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/dashboard.js
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Modified: trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp
==============================================================================
--- trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp
(original)
+++ trunk/amdatu-opensocial/dashboard/src/main/resources/jsp/dashboard.jsp
Fri Nov 26 12:09:22 2010
@@ -14,7 +14,7 @@
<script type="text/javascript"
src="/dashboard/static/js/lib/jquery-1.4.2.min.js"></script>
<script type="text/javascript"
src="/dashboard/static/js/lib/jquery-ui-1.8.2.custom.min.js"></script>
- <script type="text/javascript"
src="/dashboard/static/js/lib/jquery.dashboard.js"></script>
+ <script type="text/javascript"
src="/dashboard/static/js/lib/jquery.dashboard.min.js"></script>
<script type="text/javascript"
src="/dashboard/static/js/lib/themeroller.js"></script>
<script type="text/javascript"
src="/dashboard/static/js/gadgets_appdata.js"></script>
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/dashboard.js
==============================================================================
--- trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/dashboard.js
(original)
+++ trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/dashboard.js
Fri Nov 26 12:09:22 2010
@@ -87,7 +87,7 @@
var metadata = widget.metadata;
if (typeof metadata != 'undefined' && typeof metadata.gadgeturl !=
'undefined') {
var gadget = shindig.container.createGadget(
- {serviceName: widget.id, specUrl: metadata.gadgeturl, width:
"100%", secureToken: widget.securetoken});
+ {serviceName: widget.id, specUrl: metadata.gadgeturl, width:
"100%", secureToken: metadata.securetoken});
shindig.container.addGadget(gadget);
var chrome = shindig.container.layoutManager.getGadgetChrome(widget);
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
==============================================================================
---
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
(original)
+++
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/gadgets_appdata.js
Fri Nov 26 12:09:22 2010
@@ -22,7 +22,7 @@
// Adds a gadget to the AppData of the current user
addWidgetToAppData = function(obj, startId, dashboard) {
- var currentGadgets = retrieveCurrentWidgetsInAppData(obj.securetoken);
+ var currentGadgets =
retrieveCurrentWidgetsInAppData(obj.metadata.securetoken);
var gadgetId = startId + '-' + obj.url;
// use appData opensocial call to add this gadget to the users appData
@@ -33,7 +33,7 @@
postdata += currentGadgets + " " + gadgetId + '"}';
}
- var url = "/social/rest/appdata/@me/@self/" + gadgetId +
"?fields=registeredgadgets&st=" + obj.securetoken;
+ var url = "/social/rest/appdata/@me/@self/" + gadgetId +
"?fields=registeredgadgets&st=" + obj.metadata.securetoken;
jQuery.ajax({
url: url,
type: "PUT",
@@ -46,7 +46,6 @@
"id":gadgetId,
"title":obj.title,
"url":"",
- "securetoken":obj.securetoken,
"metadata":obj.metadata
}, dashboard.element.find('.column:first'));
},
@@ -58,11 +57,10 @@
// Removes a gadget from the AppData of the current user
removeWidgetFromAppData = function(obj, dashboard) {
- var currentGadgets = retrieveCurrentWidgetsInAppData(obj.securetoken);
+ var currentGadgets =
retrieveCurrentWidgetsInAppData(obj.metadata.securetoken);
currentGadgets = currentGadgets.replace(obj.id, "");
var postdata = '{"registeredgadgets":"' + currentGadgets + '"}';
-
- var url = "/social/rest/appdata/@me/@self/?fields=registeredgadgets&st=" +
obj.securetoken;
+ var url = "/social/rest/appdata/@me/@self/?fields=registeredgadgets&st=" +
obj.metadata.securetoken;
jQuery.ajax({
url: url,
type: "PUT",
Modified:
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
==============================================================================
---
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
(original)
+++
trunk/amdatu-opensocial/dashboard/src/main/resources/static/js/lib/jquery.dashboard.js
Fri Nov 26 12:09:22 2010
@@ -200,7 +200,6 @@
editurl: obj.editurl,
title: obj.title,
open: obj.open,
- securetoken: obj.securetoken,
metadata: obj.metadata
});
}
Modified:
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/service/GadgetManagementServiceImpl.java
Fri Nov 26 12:09:22 2010
@@ -638,7 +638,8 @@
}
String securityToken = Utf8UrlCoder.encode(st.encrypt());
- gadget.put("securetoken", securityToken);
+
+ gadget.getJSONObject("metadata").put("securetoken", securityToken);
}
private String[] getDefaultGadgetUrls() {
