litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from 1.5 branch: NIHVIVO-3954 Add OpenSocial bug fixes from Eric Meeks: make compound key in app_registry table, show sandbox login, ensure that randomly assigned Gadget ID is not negative, modify JS to find out whose page we are on.

Browse source
This commit is contained in:
j2blake 2012-09-07 15:41:57 +00:00
parent 07b73bbc22
commit 0a72583712
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/js/openSocial/orng.js
View file

@ -72,8 +72,10 @@ gadgets.pubsubrouter.init(function(id) {
else if (channel == 'added' && my.gadgets[moduleId].view == 'home') {
if (message == 'Y') {
_gaq.push(['_trackEvent', my.gadgets[moduleId].name, 'SHOW', 'profile_edit_view']);
// find out whose page we are on, if any
var userId = gadgets.util.getUrlParameters()['uri'] || document.URL.replace('/display/', '/individual/');
osapi.activities.create(
{ 'userId': gadgets.util.getUrlParameters()['Person'],
{ 'userId': userId,
'appId': my.gadgets[moduleId].appId,
'activity': {'postedTime': new Date().getTime(), 'title': 'added a gadget', 'body': 'added the ' + my.gadgets[moduleId].name + ' gadget to their profile' }
}).execute(function(response){});
@ -389,8 +391,10 @@ OrngGadget.prototype.handleToggle = function() {
_gaq.push(['_trackEvent', my.gadgets[this.id].name, 'OPEN_IN_EDIT', 'profile_edit_view']);
}
else {
// find out whose page we are on, if any
var userId = gadgets.util.getUrlParameters()['uri'] || document.URL.replace('/display/', '/individual/');
osapi.activities.create(
{ 'userId': gadgets.util.getUrlParameters()['Person'],
{ 'userId': userId,
'appId': my.gadgets[this.id].appId,
'activity': {'postedTime': new Date().getTime(), 'title': 'gadget viewed', 'body': my.gadgets[this.id].name + ' gadget was viewed' }
}).execute(function(response){});