From ec108ab221b119b68910454304818aed38c2ad80 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Fri, 12 Aug 2022 12:52:29 -0400
Subject: [PATCH 1/2] fix npes on template page

---
 src/main/webapp/dataset-license-terms.xhtml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 1a190064a42..7d83b15fb89 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -248,7 +248,7 @@
            <div id="panelCollapseTOA" jsf:class="#{!datasetPage.hasValidTermsOfAccess ? 'collapse' : ''}">
                <div class="panel-body">
                    <ui:fragment rendered="#{empty editMode}">
-                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and DatasetPage.hasRestrictedFiles}">
+                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and datasetPage and DatasetPage.hasRestrictedFiles}">
                            <label for="datasetForm:tabView:metadata_RestrictedFiles" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
@@ -295,19 +295,7 @@
                    <ui:fragment rendered="#{!empty editMode}">
                         <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}"> 
                             <p:fragment id="termsOfAccessHelp">
-                                <ui:remove>
-                                <ui:fragment rendered="#{datasetPage == true and (!DatasetPage.hasRestrictedFiles or !termsOfUseAndAccess.fileAccessRequest)}">
-                                    <p class="help-block">
-                                       
-                                        <h:outputText value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description']}"/>
-                                        <h:outputFormat value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description.line.2']}" escape="false">
-                                            <f:param value="#{systemConfig.guidesBaseUrl}"/>
-                                            <f:param value="#{systemConfig.guidesVersion}"/>
-                                        </h:outputFormat>
-                                    </p>                                    
-                                </ui:fragment>
-                                </ui:remove>
-                                <ui:fragment rendered="#{DatasetPage.hasRestrictedFiles}">
+                                <ui:fragment rendered="#{datasetPage == true and DatasetPage.hasRestrictedFiles}">
                                     <div class="alert alert-info">
                                         <span class="glyphicon glyphicon-info-sign"></span>&#160;<strong>#{bundle['messages.info']}</strong> –
                                         <h:outputText value=" #{bundle['file.dataFilesTab.terms.list.termsOfAccess.description']}"/>

From 6b801bdce9e3d2bbd59d90c7a7aac895ee52a01c Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Fri, 12 Aug 2022 13:40:55 -0400
Subject: [PATCH 2/2] add == true for clarity

---
 src/main/webapp/dataset-license-terms.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index 7d83b15fb89..f51c899f479 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -248,7 +248,7 @@
            <div id="panelCollapseTOA" jsf:class="#{!datasetPage.hasValidTermsOfAccess ? 'collapse' : ''}">
                <div class="panel-body">
                    <ui:fragment rendered="#{empty editMode}">
-                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and datasetPage and DatasetPage.hasRestrictedFiles}">
+                       <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and datasetPage== true and DatasetPage.hasRestrictedFiles}">
                            <label for="datasetForm:tabView:metadata_RestrictedFiles" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"