Author: mfranklin
Date: Wed Feb 13 22:01:51 2013
New Revision: 1445952
URL: http://svn.apache.org/r1445952
Log:
Added parameter to rave initialization to specify pageType RAVE-889
Modified:
rave/trunk/rave-portal-resources/src/main/resources/db/initial-data.json
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
Modified:
rave/trunk/rave-portal-resources/src/main/resources/db/initial-data.json
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/db/initial-data.json?rev=1445952&r1=1445951&r2=1445952&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/db/initial-data.json
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/db/initial-data.json
Wed Feb 13 22:01:51 2013
@@ -1606,6 +1606,30 @@
"context": "9gW2YVBrNVA"
}
}
+ },
+ {
+ "published": "2013-02-12T15:04:55Z",
+ "actor": {
+ "url": "http://localhost:8080/portal/app/people/john.doe";,
+ "objectType": "person",
+ "id": "john.doe",
+ "image": {
+ "url": "http://example.org/john.doe/image";,
+ "width": 250,
+ "height": 250
+ }
+ },
+ "verb": "make-friend",
+ "object" : {
+ "url": "http://localhost:8080/portal/app/people/jane.doe";,
+ "objectType": "person",
+ "id": "jane.doe",
+ "image": {
+ "url": "http://example.org/jane.doe/image";,
+ "width": 250,
+ "height": 250
+ }
+ }
}
]
}
\ No newline at end of file
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1445952&r1=1445951&r2=1445952&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
Wed Feb 13 22:01:51 2013
@@ -206,7 +206,7 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
$(function () {
- rave.initProviders();
+ rave.initProviders("profile");
rave.initWidgets();
rave.initUI();
rave.layout.init();
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js?rev=1445952&r1=1445951&r2=1445952&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js Wed
Feb 13 22:01:51 2013
@@ -954,13 +954,13 @@ var rave = rave || (function () {
widgetsByRegionIdArray = [];
}
- function initializeProviders() {
+ function initializeProviders(pageType) {
//Current providers are rave.wookie and rave.opensocial.
//Providers register themselves when loaded, so
//JavaScript library importing order is important.
//See page.jsp for example.
for (var key in providerMap) {
- providerMap[key].init();
+ providerMap[key].init(pageType);
}
if(onProvidersInitializedHandlers !== null &&
onProvidersInitializedHandlers.length > 0){
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js?rev=1445952&r1=1445951&r2=1445952&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
Wed Feb 13 22:01:51 2013
@@ -24,6 +24,7 @@ rave.opensocial = rave.opensocial || (fu
CANVAS:"canvas",
DEFAULT:"default",
HOME:"home",
+ PROFILE:"profile",
PREFERENCES:"preferences"
};
var VIEW_TARGETS = {
@@ -31,14 +32,15 @@ rave.opensocial = rave.opensocial || (fu
DIALOG: 'dialog',
MODALDIALOG: 'modal_dialog',
SIDEBAR: 'sidebar'
- }
+ };
- var container;
+ var container, defaultView;
/**
* Initialization
*/
- function initOpenSocial() {
+ function initOpenSocial(view) {
+ defaultView = typeof view == "string" ? view :VIEW_NAMES.HOME;
initContainer();
registerRpcHooks();
implementViews();
@@ -196,7 +198,7 @@ rave.opensocial = rave.opensocial || (fu
renderGadgetView(viewName, this, view_params);
};
gadget.minimize = function (view_params, view) {
- var viewName = (typeof(view) === "undefined" || view === null) ?
rave.opensocial.VIEW_NAMES.HOME : view;
+ var viewName = (typeof(view) === "undefined" || view === null) ?
defaultView : view;
renderGadgetViewIfNotCollapsed(viewName, this, view_params);
};
gadget.collapse = function () {
@@ -204,7 +206,7 @@ rave.opensocial = rave.opensocial || (fu
$(getGadgetIframeByWidgetId(this.regionWidgetId)).hide();
};
gadget.restore = function () {
- renderGadgetView(rave.opensocial.VIEW_NAMES.HOME,
rave.getRegionWidgetById(this.regionWidgetId));
+ renderGadgetView(defaultView,
rave.getRegionWidgetById(this.regionWidgetId));
};
gadget.hide = function(){
$(getGadgetIframeByWidgetId(this.regionWidgetId)).closest('.widget-wrapper').hide();
@@ -243,7 +245,7 @@ rave.opensocial = rave.opensocial || (fu
// if the gadget is on a top level page, or an active sub page tab,
render it
if (!rave.layout.isWidgetOnHiddenTab(gadget)) {
// if the gadget is not collapsed, render it
- renderGadgetViewIfNotCollapsed(rave.opensocial.VIEW_NAMES.HOME,
gadget);
+ renderGadgetViewIfNotCollapsed(defaultView, gadget);
}
}
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java?rev=1445952&r1=1445951&r2=1445952&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
Wed Feb 13 22:01:51 2013
@@ -92,7 +92,8 @@ public class DefaultPersonService implem
case objectId:
return getGroupMembersFromRepository(collectionOptions,
groupId.getObjectId().toString(), token.getAppId());
case self:
- return Lists.newArrayList(getPersonForId(new
UserId(UserId.Type.me, null), token));
+ UserId id = userIds.size() == 1 ? userIds.iterator().next() :
new UserId(UserId.Type.me, null);
+ return Lists.newArrayList(getPersonForId(id, token));
case custom:
throw new
ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Custom GroupIDs are
not tracked by the container");
default:
