From 6f6192314636ffd3c0c91d098231c0568e7aecaa Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Fri, 10 Apr 2020 11:31:11 -0400
Subject: [PATCH] #6684 move publish button group logic

---
 src/main/webapp/dataset.xhtml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index fafa39c9871..ca4d46bc1b2 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -20,6 +20,12 @@
             <ui:param name="version" value="#{DatasetPage.workingVersion}"/>
             <ui:param name="locked" value="#{DatasetPage.locked}"/>
 	    <ui:param name="showMessagePanel" value="#{true}"/>
+            <ui:param name="showPublishButtonGroup" value="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion 
+                                                             and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                             and (permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
+                                                             or 
+                                                             (DatasetPage.canUpdateDataset()
+                                                             and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)))}"/>          
 	    <ui:define name="meta_header">
             <meta name="description" content="#{DatasetPage.description}"/>
             </ui:define>
@@ -228,11 +234,7 @@
 
                                                 <!-- PUBLISH DATASET -->
                                                 <div class="btn-group btn-group-justified" 
-                                                     jsf:rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                                                                     and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                                                                     or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                                                                           and DatasetPage.canUpdateDataset()
-                                                                                                           and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
+                                                     jsf:rendered="#{showPublishButtonGroup}">
                                                     <div class="btn-group">
                                                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                             PUBLISH DATASET <span class="caret"></span>