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

NIHVIVO-3772 Incorporate the most recent changes from Eric (2012-06-25)

Browse source
This commit is contained in:
j2blake 2012-06-26 16:24:54 +00:00
parent 2df37206ce
commit 54807074a1
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
opensocial/shindigorng.properties.template
View file

@ -174,18 +174,27 @@ orng.RDFConverter = elda
orng.tokenservice.port = 8777 orng.tokenservice.port = 8777
orng.securityTokenKeyFile = @TOKEN_KEY_FILE@ orng.securityTokenKeyFile = @TOKEN_KEY_FILE@
#
# Note that orng.systemDomain can be commented out in a production environment.
# It is used to trigger system specific (VIVO or Profiles) means for URI to URL conversion.
# This is sometimes necessary when a "fake" domain is being used in a testing/development environment
#
# orng.system must be set to Profiles or VIVO # orng.system must be set to Profiles or VIVO
#orng.system = Profiles #orng.system = Profiles
#orng.dbDriver = com.microsoft.sqlserver.jdbc.SQLServerDriver #orng.dbDriver = com.microsoft.sqlserver.jdbc.SQLServerDriver
#orng.dbURL = jdbc:sqlserver://dev-sql-ctsi.ucsf.edu;instanceName=default;portNumber=1433;databaseName=profiles_100 #orng.dbURL = jdbc:sqlserver://dev-sql-ctsi.ucsf.edu;instanceName=default;portNumber=1433;databaseName=profiles_100
#orng.dbUser = App_Profiles10 #orng.dbUser = App_Profiles10
#orng.dbPassword = Password1234 #orng.dbPassword = Password1234
#orng.systemDomain = http://localhost/profiles
orng.system = VIVO orng.system = VIVO
orng.dbDriver = @DATA_SOURCE_DRIVER@ orng.dbDriver = @DATA_SOURCE_DRIVER@
orng.dbURL = @DATA_SOURCE_URL@ orng.dbURL = @DATA_SOURCE_URL@
orng.dbUser = @DATA_SOURCE_USERNAME@ orng.dbUser = @DATA_SOURCE_USERNAME@
orng.dbPassword = @DATA_SOURCE_PASSWORD@ orng.dbPassword = @DATA_SOURCE_PASSWORD@
orng.systemDomain = NOT_USED

BIN
opensocial/shindigorng.war
View file

Binary file not shown.

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

@ -253,9 +253,6 @@ my.generateGadgets = function(metadata) {
}; };
my.init = function() { my.init = function() {
// overwrite this RPC function. Do it at this level so that rpc.f (this.f) is accessible for getting module ID
// gadgets.rpc.register('requestNavigateTo', doOrngNavigation);
shindig.container.gadgetClass = OrngGadget; shindig.container.gadgetClass = OrngGadget;
shindig.container.layoutManager = new OrngLayoutManager(); shindig.container.layoutManager = new OrngLayoutManager();
shindig.container.setNoCache(my.noCache); shindig.container.setNoCache(my.noCache);
@ -286,7 +283,7 @@ OrngGadgetService.inherits(shindig.IfrGadgetService);
OrngGadgetService.prototype.requestNavigateTo = function(view, opt_params) { OrngGadgetService.prototype.requestNavigateTo = function(view, opt_params) {
var viewConfig = gadgets.config.get('views')[view]; var viewConfig = gadgets.config.get('views')[view];
var url = viewConfig.urlTemplate; var url = '/' + location.pathname.split('/')[1] + '/' + viewConfig.urlTemplate;
url += window.location.search.substring(1); url += window.location.search.substring(1);