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

NIHVIVO-2963 Refactor menupage.ftl to account for class intersection pages (i.e. only display internal individuals via intersection with institutional internal class). Work in progress.

Browse source
This commit is contained in:
cappadona 2011-07-18 17:03:40 +00:00
parent 4b92cd1195
commit 301cc9d290
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapp/web/js/menupage/browseByVClass.js
View file

@ -6,6 +6,7 @@ var browseByVClass = {
this.mergeFromTemplate(); this.mergeFromTemplate();
this.initObjects(); this.initObjects();
this.bindEventListeners(); this.bindEventListeners();
this.defaultVClass();
}, },
// Add variables from menupage template // Add variables from menupage template
@ -72,6 +73,9 @@ var browseByVClass = {
// Where all the magic happens -- gonna fetch me some individuals // Where all the magic happens -- gonna fetch me some individuals
getIndividuals: function(vclassUri, alpha, page, scroll) { getIndividuals: function(vclassUri, alpha, page, scroll) {
var url = this.dataServiceUrl + encodeURIComponent(vclassUri); var url = this.dataServiceUrl + encodeURIComponent(vclassUri);
if ( this.internalClassUri !== "undefined" ) {
url += '&vclassId='+ this.internalClassUri +'&page=1';
}
if ( alpha && alpha != "all") { if ( alpha && alpha != "all") {
url += '&alpha=' + alpha; url += '&alpha=' + alpha;
} }
@ -280,5 +284,4 @@ var browseByVClass = {
$(document).ready(function() { $(document).ready(function() {
browseByVClass.onLoad(); browseByVClass.onLoad();
browseByVClass.defaultVClass();
}); });

3
webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
View file

@ -19,6 +19,9 @@
var menupageData = { var menupageData = {
baseUrl: '${urls.base}', baseUrl: '${urls.base}',
dataServiceUrl: '${dataServiceUrlIndividualsByVClass}', dataServiceUrl: '${dataServiceUrlIndividualsByVClass}',
<#if internalClass?has_content>
internalClassUri: '${internalClass}',
</#if>
defaultBrowseVClassUri: '${firstNonEmptyVClass}' defaultBrowseVClassUri: '${firstNonEmptyVClass}'
}; };
</script> </script>