Fixed msg rendering for upload pg that has a package file, plus panel…

… default open view for rsync only. [ref #4610]
IQSS · Aug 2, 2018 · ac232c8 · ac232c8
1 parent 4bb287e
commit ac232c8
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
@@ -20,8 +20,7 @@
         </ul>
         <div class="ui-tabs-panels">
             <div aria-hidden="false" role="tabpanel" class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="datasetForm:tabView:dataFilesTab">
-
-
+                <!-- Create dataset workflow info msg + user guide link -->
                 <div jsf:rendered="#{createDataset}">
                     <p class="help-block">
                         <h:outputFormat value="#{bundle['dataset.message.uploadFiles.message']}" escape="false">
@@ -242,7 +241,8 @@
                             </h4>
                         </div>
 
-                        <div id="collapseRsync" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingRsync">
+                        <!-- NOTE: conditional logic for 'in' style class opens the rsync panel if HTTP is off, but isn't scalable when a third upload mode is added -->
+                        <div id="collapseRsync" class="panel-collapse collapse #{!settingsWrapper.HTTPUpload ? 'in' : ''}" role="tabpanel" aria-labelledby="headingRsync">
                             <div class="panel-body">
                                 <ui:fragment rendered="#{createDataset}">
                                     <p class="help-block">
@@ -256,12 +256,18 @@
                                             <h:outputText class="text-danger" value=" #{bundle['file.rsyncUpload.filesExist']}" escape="false"/>
                                         </p>
                                     </ui:fragment>
-                                    <ui:fragment rendered="#{!EditDatafilesPage.isHasRsyncScript() and empty EditDatafilesPage.fileMetadatas}">
+                                    <ui:fragment rendered="#{!EditDatafilesPage.isHasRsyncScript() and (empty EditDatafilesPage.fileMetadatas and empty DatasetPage.workingVersion.hasPackageFile)}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-warning-sign text-danger"></span>
                                             <h:outputText class="text-danger" value=" #{bundle['file.rsyncUpload.noScriptAvailable']}" escape="false"/>
                                         </p>
                                     </ui:fragment>
+                                    <ui:fragment rendered="#{!EditDatafilesPage.isHasRsyncScript() and (empty EditDatafilesPage.fileMetadatas and DatasetPage.workingVersion.hasPackageFile)}">
+                                        <p class="help-block">
+                                            <span class="glyphicon glyphicon-warning-sign text-danger"></span>
+                                            <h:outputText class="text-danger" value=" #{bundle['file.rsyncUpload.filesExist']}" escape="false"/>
+                                        </p>
+                                    </ui:fragment>
                                     <ui:fragment rendered="#{EditDatafilesPage.isHasRsyncScript() and empty EditDatafilesPage.fileMetadatas}">
                                         <p class="help-block">
                                             <span class="glyphicon glyphicon-info-sign"></span>