From 6a6058239f7984a018420f19385a5586365521e6 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 13 Dec 2018 16:12:51 -0500
Subject: [PATCH] Fixed 'ResourceBundles are immutable' error on My Data [ref
 #4679]

---
 src/main/webapp/mydata_fragment.xhtml         | 39 ++++++-----
 .../mydata_templates/cards_minimum.html       | 10 +--
 src/main/webapp/resources/js/mydata.js        | 67 ++++++++++---------
 3 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/src/main/webapp/mydata_fragment.xhtml b/src/main/webapp/mydata_fragment.xhtml
index 23742b1f0bc..213fd2eb86e 100644
--- a/src/main/webapp/mydata_fragment.xhtml
+++ b/src/main/webapp/mydata_fragment.xhtml
@@ -31,19 +31,6 @@
         </div>
         </ui:fragment>
     </div>
-    <div>
-        <h:inputHidden id="mydataresult" value="#{bundle['mydata.result']}" />
-        <h:inputHidden id="mydataresults" value="#{bundle['mydata.results']}" />
-        <h:inputHidden id="mydataviewnext" value="#{bundle['mydata.viewnext']}" />
-        <h:inputHidden id="mydatamore" value="#{bundle['mydata.more']}" />
-        <h:inputHidden id="draft" value="#{bundle['Draft']}" />
-        <h:inputHidden id="inreview" value="#{bundle['In Review']}" />
-        <h:inputHidden id="unpublished" value="#{bundle['Unpublished']}" />
-        <h:inputHidden id="published" value="#{bundle['Published']}" />
-        <h:inputHidden id="deaccessioned" value="#{bundle['Deaccessioned']}" />
-        <h:inputHidden id="mydatato" value="#{bundle['to']}" />
-        <h:inputHidden id="mydataof" value="#{bundle['of']}" />
-    </div>
 <!-- start: panel --><div class="panel panel-default">
 <!-- start: panel body --><div class="panel-body clearfix">
     
@@ -124,11 +111,27 @@
         <ui:remove>This variable is needed by mydata.js to make the ajax call</ui:remove>
         var RETRIEVE_DATA_API_PATH = '#{MyDataPage.retrieveDataFullAPIPath}';
     </script>
-    <script src="#{resource['js/mydata.js']}?version=#{systemConfig.getVersion()}b"></script>
-    <script>            
-          $(document).ready(function() {
-             init_mydata_page(); // source: mydata.js 
-           });
+    <script src="#{resource['js/mydata.js']}?version=#{systemConfig.getVersion()}"></script>
+    <script>
+        
+        // bundle text variables
+        var mydataresult = '#{bundle['mydata.result']}';
+        var mydataresults = '#{bundle['mydata.results']}';
+        var mydataviewnext = '#{bundle['mydata.viewnext']}';
+        var mydatamore = '#{bundle['mydata.more']}';
+        var draft = '#{bundle['Draft']}';
+        var inreview = '#{bundle['In Review']}';
+        var unpublished = '#{bundle['Unpublished']}';
+        var published = '#{bundle['Published']}';
+        var deaccessioned = '#{bundle['Deaccessioned']}';
+        var mydatato = '#{bundle['to']}';
+        var mydataof = '#{bundle['of']}';
+            
+        $(document).ready(function() {
+              
+            init_mydata_page(); // source: mydata.js
+            
+        });
     </script>
 </div><!-- end panel body -->
 </div><!-- end panel -->
diff --git a/src/main/webapp/mydata_templates/cards_minimum.html b/src/main/webapp/mydata_templates/cards_minimum.html
index 1b0cbe0b648..88027b62ca8 100644
--- a/src/main/webapp/mydata_templates/cards_minimum.html
+++ b/src/main/webapp/mydata_templates/cards_minimum.html
@@ -26,11 +26,11 @@
             <a href="/file.xhtml?fileId={{ card_info.entity_id }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
  {% endif %}
         <!-- publication status -->
-        {#({{ loop.index }})#} {% if card_info.is_draft_state %}<span class="label label-primary"><span name="draft"></span></span> {% endif %}
-        {% if card_info.is_in_review_state %}<span class="label label-success"><span name="inreview"></span></span> {% endif %}
-        {% if card_info.is_unpublished_state %}<span class="label label-warning"><span name="unpublished"></span></span> {% endif %}
-        {% if card_info.is_published %} <span class="label label-warning"><span name="published"></span></span> {% endif %}
-        {% if card_info.is_deaccesioned %} <span class="label label-danger"><span name="deaccessioned"></span></span> {% endif %}
+        {#({{ loop.index }})#} {% if card_info.is_draft_state %}<span class="label label-primary draft"></span> {% endif %}
+        {% if card_info.is_in_review_state %}<span class="label label-success inreview"></span> {% endif %}
+        {% if card_info.is_unpublished_state %}<span class="label label-warning unpublished"></span> {% endif %}
+        {% if card_info.is_published %} <span class="label label-warning published"></span> {% endif %}
+        {% if card_info.is_deaccesioned %} <span class="label label-danger deaccessioned"></span> {% endif %}
         
         <!-- roles -->
         {% for role_name in card_info.user_roles %}
diff --git a/src/main/webapp/resources/js/mydata.js b/src/main/webapp/resources/js/mydata.js
index cce3291898b..182df7cc62f 100644
--- a/src/main/webapp/resources/js/mydata.js
+++ b/src/main/webapp/resources/js/mydata.js
@@ -2,6 +2,19 @@ var MYDATA_DEBUG_ON = false; // activate to show json, form info, etc
 var SHOW_PAGINATION = false; // pagination is available
 var APPEND_CARDS_TO_BOTTOM = false;  // always starts as false
 
+// bundle text variables
+var mydataresult = '';
+var mydataresults = '';
+var mydataviewnext = '';
+var mydatamore = '';
+var draft = '';
+var inreview = '';
+var unpublished = '';
+var published = '';
+var deaccessioned = '';
+var mydatato = '';
+var mydataof = '';
+
 function bind_checkbox_labels(){
     // This should be generalized to one function....once css is set
  
@@ -306,19 +319,11 @@ function updatePagination(json_data){
             
         }
 
-        if (document.getElementById("result")) {
-            document.getElementById('result').innerHTML = document.getElementById('dataverseUserForm:dataRelatedToMeView:mydataresult').value;
-        }
-        if (document.getElementById("results")) {
-            document.getElementById('results').innerHTML = document.getElementById('dataverseUserForm:dataRelatedToMeView:mydataresults').value;
-        }
+        $('#result').html(mydataresult);
+        $('#results').html(mydataresults);
 
-        if (document.getElementById("to")) {
-            document.getElementById('to').innerHTML = document.getElementById('dataverseUserForm:dataRelatedToMeView:mydatato').value;
-        }
-        if (document.getElementById("of")) {
-            document.getElementById('of').innerHTML = document.getElementById('dataverseUserForm:dataRelatedToMeView:mydataof').value;
-        }
+        $('#to').html(mydatato);
+        $('#of').html(mydataof);
 
 
         // --------------------------------
@@ -330,11 +335,11 @@ function updatePagination(json_data){
             //console.log("update link to: " + pagination_json.nextPageNumber);
             $('#div-more-cards-link').show();
 
-            var view_next = document.getElementById("dataverseUserForm:dataRelatedToMeView:mydataviewnext").value;
-            var more = document.getElementById("dataverseUserForm:dataRelatedToMeView:mydatamore").value;
-            var result_label = document.getElementById("dataverseUserForm:dataRelatedToMeView:mydataresults").value;
+            var view_next = mydataviewnext;
+            var more = mydatamore;
+            var result_label = mydataresults;
             if (pagination_json.numberNextResults == 1){
-                result_label = document.getElementById("dataverseUserForm:dataRelatedToMeView:mydataresult").value;
+                result_label = mydataresult;
             }
             $('#lnk_add_more_cards').html(view_next + ' ' + pagination_json.numberNextResults + ' ' + result_label + ' (' + pagination_json.remainingCards + ' ' + more +')');
         }
@@ -458,34 +463,34 @@ function submit_my_data_search(){
             $('#ajaxStatusPanel_start').hide();
 
 
-            if (document.getElementsByName("draft")) {
-                var y = document.getElementsByName("draft");
+            if ($("span.label.draft")) {
+                var y = $("span.label.draft");
                 for (var i = 0; i < y.length; i++) {
-                    y[i].innerHTML = document.getElementById( 'dataverseUserForm:dataRelatedToMeView:draft' ).value;
+                    y[i].innerHTML = draft;
                 }
             }
-            if (document.getElementsByName("inreview")) {
-                var y = document.getElementsByName("inreview");
+            if ($("span.label.inreview")) {
+                var y = $("span.label.inreview");
                 for (var i = 0; i < y.length; i++) {
-                    y[i].innerHTML = document.getElementById( 'dataverseUserForm:dataRelatedToMeView:inreview' ).value;
+                    y[i].innerHTML = inreview;
                 }
             }
-            if (document.getElementsByName("published")) {
-                var y = document.getElementsByName("published");
+            if ($("span.label.published")) {
+                var y = $("span.label.published");
                 for (var i = 0; i < y.length; i++) {
-                    y[i].innerHTML = document.getElementById( 'dataverseUserForm:dataRelatedToMeView:published' ).value;
+                    y[i].innerHTML = published;
                 }
             }
-            if (document.getElementsByName("unpublished")) {
-                var y = document.getElementsByName("unpublished");
+            if ($("span.label.unpublished")) {
+                var y = $("span.label.unpublished");
                 for (var i = 0; i < y.length; i++) {
-                    y[i].innerHTML = document.getElementById( 'dataverseUserForm:dataRelatedToMeView:unpublished' ).value;
+                    y[i].innerHTML = unpublished;
                 }
             }
-            if (document.getElementsByName("deaccessioned")) {
-                var y = document.getElementsByName("deaccessioned");
+            if ($("span.label.deaccessioned")) {
+                var y = $("span.label.deaccessioned");
                 for (var i = 0; i < y.length; i++) {
-                    y[i].innerHTML = document.getElementById( 'dataverseUserForm:dataRelatedToMeView:deaccessioned' ).value;
+                    y[i].innerHTML = deaccessioned;
                 }
             }