Merge branch '4.2.3' of github.com:IQSS/dataverse_temp into 4.2.3

bionary · Jan 8, 2016 · 7b60402 · 7b60402
2 parents 25eb2db + 45a02ef
commit 7b60402
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -806,6 +806,17 @@
                             <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForEditMetadata').hide();PF('blockDatasetForm').hide();"/>
                         </div>
                     </p:dialog>
+
+                    <p:dialog id="selectFilesForEditTags" styleClass="smallPopUp"
+                              header="#{bundle['dataset.noSelectedFiles.header']}" widgetVar="selectFilesForEditTags" modal ="true">
+                        <p class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataset.noSelectedFilesForMetadataEdit']}</p>
+                        <div class="button-block">
+                            <p:commandButton value="#{bundle.close}" onclick="PF('selectFilesForEditTags').hide();PF('blockDatasetForm').hide();"/>
+                        </div>
+                    </p:dialog>
+
+                    <p:remoteCommand  name="refreshTagsCommand" action="#{DatasetPage.refreshTagsPopUp()}" update=":datasetForm:fileTagsPopup"
+                                      oncomplete="PF('fileTagsPopup').show();"/>
 
                     <!-- We no longer need this remoteCommand; see my comments in the javascript method testFilesSelectedForEditMetadata() -->
                     <!-- for more info. - L.A. 4.2.1 -->
@@ -1277,6 +1288,15 @@
 
                     }
 
+                    function testFilesSelectedForTags(){
+                        var count = PF('filesTable').getSelectedRowsCount();
+                        if (count === 0) {
+                            PF('selectFilesForEditTags').show();
+                        } else {
+                           refreshTagsCommand();
+                        }                       
+                    }
+
                     function testFilesSelectedForDelete(){
                         var count = PF('filesTable').getSelectedRowsCount();
                         if (count === 0) {

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -81,13 +81,11 @@
                                     </p:commandLink>
                                 </li>
                                 <li class="#{DatasetPage.locked  ? 'disabled' : ''}">
-                                    <p:commandLink id="fileCategoriesLink"                                               
-                                                   actionListener="#{DatasetPage.refreshTagsPopUp()}"
-                                                   update=":datasetForm:fileTagsPopup"
-                                                   oncomplete="PF('fileTagsPopup').show();bind_bsui_components();">
-                                        #{bundle['file.tags']}
+                                    <p:commandLink id="fileCategoriesLinkTwo"    
+                                                   onclick="testFilesSelectedForTags()">
+                                        #{bundle['file.tags']} 
                                     </p:commandLink>    
-                                </li>
+                                </li>                                                               
                             </ul>
                             <p:remoteCommand  name="openEditFilesPageCommand2" partialSubmit="true" async="true" update="" action="#{DatasetPage.editFileMetadata()}"  />
                         </div>