From 301cc9d290198eb7e2a422b7f8e86b7ca41a0f44 Mon Sep 17 00:00:00 2001
From: cappadona <cappadona@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 18 Jul 2011 17:03:40 +0000
Subject: [PATCH] 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.

---
 webapp/web/js/menupage/browseByVClass.js                     | 5 ++++-
 .../freemarker/body/partials/menupage/menupage-scripts.ftl   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/webapp/web/js/menupage/browseByVClass.js b/webapp/web/js/menupage/browseByVClass.js
index eb732a450..ec36e5445 100644
--- a/webapp/web/js/menupage/browseByVClass.js
+++ b/webapp/web/js/menupage/browseByVClass.js
@@ -6,6 +6,7 @@ var browseByVClass = {
         this.mergeFromTemplate();
         this.initObjects();
         this.bindEventListeners();
+        this.defaultVClass();
     },
     
     // Add variables from menupage template
@@ -72,6 +73,9 @@ var browseByVClass = {
     // Where all the magic happens -- gonna fetch me some individuals
     getIndividuals: function(vclassUri, alpha, page, scroll) {
         var url = this.dataServiceUrl + encodeURIComponent(vclassUri);
+        if ( this.internalClassUri !== "undefined" ) {
+            url += '&vclassId='+ this.internalClassUri +'&page=1';
+        }
         if ( alpha && alpha != "all") {
             url += '&alpha=' + alpha;
         }
@@ -280,5 +284,4 @@ var browseByVClass = {
 
 $(document).ready(function() {
     browseByVClass.onLoad();
-    browseByVClass.defaultVClass();
 });
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
index c26cf60d9..ab20ca495 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
@@ -19,10 +19,13 @@
     var menupageData = {
         baseUrl: '${urls.base}',
         dataServiceUrl: '${dataServiceUrlIndividualsByVClass}',
+        <#if internalClass?has_content>
+            internalClassUri: '${internalClass}',
+        </#if>
         defaultBrowseVClassUri: '${firstNonEmptyVClass}'
     };
 </script>
 
 <#-- Script to enable browsing individuals within a class -->
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.scrollTo-min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/menupage/browseByVClass.js"></script>')}
+              '<script type="text/javascript" src="${urls.base}/js/menupage/browseByVClass.js"></script>')}
\ No newline at end of file