Merge pull request #7429 from IQSS/7427-fix-terms-of-access

Add render logic around edit file popup fragment #7427
IQSS · Nov 19, 2020 · df84e96 · df84e96
2 parents 40cda0e + 2abfef0
commit df84e96
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -828,15 +828,16 @@
                     </div>
                     <!-- END: Create/Save Dataset Button Panel BTM editMode -->
                     <p:blockUI block="datasetForm" widgetVar="blockDatasetForm"/>
-                    <!-- POPUPS -->                    
-                    <ui:include src="file-edit-popup-fragment.xhtml">
-                        <ui:param name="datasetVersion" value="#{DatasetPage.workingVersion}"/>   
-                        <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>                        
-                        <ui:param name="bean" value="#{DatasetPage}"/>                        
-                        <ui:param name="restrictFileAction" value="restrictFiles"/>
-                        <ui:param name="deleteFileAction" value="deleteFiles"/> 
-                    </ui:include>                  
-
+                    <!-- POPUPS -->
+                    <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE' or empty DatasetPage.editMode }">                    
+                        <ui:include src="file-edit-popup-fragment.xhtml">
+                              <ui:param name="datasetVersion" value="#{DatasetPage.workingVersion}"/>   
+                              <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>                        
+                              <ui:param name="bean" value="#{DatasetPage}"/>                        
+                              <ui:param name="restrictFileAction" value="restrictFiles"/>
+                              <ui:param name="deleteFileAction" value="deleteFiles"/> 
+                        </ui:include>                  
+                    </ui:fragment>
                     <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true" rendered="#{!DatasetPage.workingVersion.deaccessioned}">
                         <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
                         <div id="sharrre-widget" data-url="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>