[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. dcb1bc27741ffeb7303a657af02a772a52c0cb2f

Evergreen Git git at git.evergreen-ils.org
Wed Mar 21 11:00:11 EDT 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_0 has been updated
       via  dcb1bc27741ffeb7303a657af02a772a52c0cb2f (commit)
      from  30bd62603e3816620f450c8395a2c0aff5a1e4d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dcb1bc27741ffeb7303a657af02a772a52c0cb2f
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Thu Mar 15 11:13:27 2018 -0400

    LP#1756110: fix egBasicComboBox drop-down functionality
    
    Somehow egBasicComboBox got missed when it became necessary to
    switch to the newer way of specifying Bootstrap drop-downs. This
    patch rectifies that and fixes the drop-down functionality.
    
    To test
    -------
    [1] Create a report template in the web staff report editor and
        add a filter field.
    [2] Attempt to change the filter operator. Note that nothing happens
        when the drop-down button is clicked.
    [3] Apply the patch and repeat step 2. This time, the drop-down
        should work and display the list of available filter operators.
    
    Other places affected include:
    
    - The part selector in the volume/copy editor
    - Template selector in the volume/copy editor
    - Template selector in the labels interface
    - Routing label selector in the subscription manager
    - Call number prefix and suffix selectors in the serials batch receiving
      interface
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    
    Conflicts:
    	Open-ILS/web/js/ui/default/staff/services/ui.js

diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index 24c6d50..cd97390 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -671,9 +671,9 @@ function($window , egStrings) {
         template:
             '<div class="input-group">'+
                 '<input placeholder="{{placeholder}}" type="text" ng-disabled="egDisabled" class="form-control" ng-model="selected" ng-change="makeOpen()" focus-me="focusMe">'+
-                '<div class="input-group-btn" dropdown ng-class="{open:isopen}">'+
-                    '<button type="button" ng-click="showAll()" ng-disabled="egDisabled" class="btn btn-default dropdown-toggle"><span class="caret"></span></button>'+
-                    '<ul class="dropdown-menu dropdown-menu-right">'+
+                '<div class="input-group-btn" uib-dropdown ng-class="{open:isopen}">'+
+                    '<button type="button" ng-click="showAll()" ng-disabled="egDisabled" class="btn btn-default" uib-dropdown-toggle><span class="caret"></span></button>'+
+                    '<ul uib-dropdown-menu class="dropdown-menu-right">'+
                         '<li ng-repeat="item in list|filter:selected:compare"><a href ng-click="changeValue(item)">{{item}}</a></li>'+
                         '<li ng-if="complete_list" class="divider"><span></span></li>'+
                         '<li ng-if="complete_list" ng-repeat="item in list"><a href ng-click="changeValue(item)">{{item}}</a></li>'+

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/ui/default/staff/services/ui.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list