bastion 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c7fe733a22410ca7cf6a17aaed71e8373efeb4
-  data.tar.gz: 2cd0cf452ca0000dd3643c4ed3b6b8603cc23fb1
+  metadata.gz: f0d3d2dd8dba1c9d5e1e7ec97ea470cbbbf010b5
+  data.tar.gz: e1822a868e460069a8a2631f3a6987aaca73bd3c
 SHA512:
-  metadata.gz: 44a83fce72d0f3a18c8bcd3f5fbc78c18398fa178ee69023dc2201d7e7d5ee4de7b849a058b889e81a2cf3309be0ab896b1cf8c2f6355206f68a414ed8688598
-  data.tar.gz: de02c1e4d11ee3a8e1553388a6143fc8bf35495f987086de2fb6df3a46dc4eac36b7ab33705ef13ad1b9b310579d7c4d8a8457a433a355ce8e9a0c38dff24219
+  metadata.gz: b93d2e4416c5c77596546b67ecf596bd33c15aee450adc461fb1d274bde2ff747ffa73033281fe9cfa61b511888760ff2cf9a017a3921e9a73520a50b152ca94
+  data.tar.gz: 12d400337473db4c91e0e956974eacfbb5e3a6ccd873747323c5ff849a6df3416a05c3cd3a6603eb1d06893e7bb94c47fd6702fa835f4d02158084645d26cacd

data/app/assets/javascripts/bastion/components/bst-edit.directive.js

@@ -28,7 +28,7 @@ angular.module('Bastion.components')
             $scope.editMode = false;
             $scope.workingMode = true;
 
-            if (angular.isDefined(action) && action.hasOwnProperty('then')) {
+            if (angular.isDefined(action) && 'then' in action) {
                 action.then(
                     function () {
                         $scope.updateDisplay($scope.model);
@@ -57,7 +57,7 @@ angular.module('Bastion.components')
                 }
 
                 if (angular.isDefined(options)) {
-                    if (options.hasOwnProperty('then')) {
+                    if ('then' in options) {
                         $scope.workingMode = true;
                         $scope.editMode = false;
                         options.then(function (data) {
@@ -119,7 +119,7 @@ angular.module('Bastion.components')
 
             handleDelete = $scope.handleDelete({ value: $scope.model });
 
-            if (angular.isDefined(handleDelete) && handleDelete.hasOwnProperty('then')) {
+            if (angular.isDefined(handleDelete) && 'then' in handleDelete) {
 
                 handleDelete.then(
                     function () {
@@ -344,7 +344,7 @@ angular.module('Bastion.components')
 
             handleAdd = $scope.handleAdd(value);
 
-            if (angular.isDefined(handleAdd) && handleAdd.hasOwnProperty('then')) {
+            if (angular.isDefined(handleAdd) && 'then' in handleAdd) {
 
                 handleAdd.then(
                     function () {

data/app/assets/javascripts/bastion/components/nutupane.factory.js

@@ -63,6 +63,7 @@ angular.module('Bastion.components').factory('Nutupane',
                 if (table.initialLoad) {
                     table.refreshing = true;
                     table.initialLoad = false;
+                    table.searchCompleted = false;
                 }
 
                 params.page = table.resource.page + 1;
@@ -259,6 +260,11 @@ angular.module('Bastion.components').factory('Nutupane',
 
                 if (!self.table.working) {
                     self.table.refreshing = true;
+                    if (searchTerm) {
+                        self.table.searchCompleted = true;
+                    } else {
+                        self.table.searchCompleted = false;
+                    }
                     self.query();
                 }
             };

data/app/assets/javascripts/bastion/layouts/nutupane.html

@@ -31,6 +31,12 @@
                typeahead-empty
                typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
         <span class="input-group-btn">
+          <button class="btn btn-default"
+                  type="button"
+                  ng-click='table.search("") && (table.searchCompleted = false)' 
+                  ng-show="table.searchCompleted && table.searchTerm">
+            <i class="fa fa-times"></i>
+          </button>
           <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button">
             <i class="fa fa-search"></i>
             <span translate>Search</span>
@@ -64,9 +70,12 @@
       <span ng-hide="$root.$state.current.collapsed">{{ "Loading..." | translate }}</span>
     </div>
 
-    <p bst-alert="info" ng-show="table.rows.length === 0 && !table.working">
+    <p bst-alert="info" ng-show="table.rows.length === 0 && !table.working && !table.searchTerm && !table.searchCompleted">
       <span data-block="no-rows-message"></span>
     </p>
+    <p bst-alert="info" ng-show="table.rows.length === 0 && !table.working && (table.searchTerm || table.searchCompleted)">
+      <span data-block="no-search-results-message"></span>
+    </p>
 
     <div ng-show="table.rows.length > 0" bst-container-scroll data="table.rows">
       <div infinite-scroll="table.nextPage()" infinite-scroll-container="'.container-scroll-wrapper'" infinite-scroll-listen-for-event="nutupane:loaded"

data/app/assets/stylesheets/bastion/nutupane.scss

@@ -285,7 +285,7 @@ td.row-select {
   }
 
   .nav.nav-tabs {
-    margin-bottom: 20px;
+    margin-bottom: 5px;
   }
 
   .nutupane-bar {

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/package.json

@@ -18,7 +18,8 @@
     "karma-jasmine": "^1.0.2",
     "karma-ng-html2js-preprocessor": "^1.0.0",
     "karma-phantomjs-launcher": "^1.0.0",
-    "require-dir": "~0.1.0"
+    "require-dir": "~0.1.0",
+    "phantomjs-prebuilt": "2.1.10"
   },
   "engines": {
     "node": ">=0.8.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -144,7 +144,6 @@ files:
 - app/assets/javascripts/bastion/layouts/select-all-results.html
 - app/assets/javascripts/bastion/menu/menu-expander.service.js
 - app/assets/javascripts/bastion/menu/menu.module.js
-- app/assets/javascripts/bastion/utils/as.filter.js
 - app/assets/javascripts/bastion/utils/form-utils.service.js
 - app/assets/javascripts/bastion/utils/urlencode.filter.js
 - app/assets/javascripts/bastion/utils/utils.module.js
@@ -212,7 +211,6 @@ files:
 - test/i18n/translate.service.test.js
 - test/menu/menu-expander.service.test.js
 - test/test-mocks.module.js
-- test/utils/as.filter.test.js
 - test/utils/form-utils.service.test.js
 - test/utils/urlencode.filter.test.js
 - vendor/assets/javascripts/bastion/angular-animate/angular-animate.js
@@ -1040,5 +1038,4 @@ test_files:
 - test/bastion/bastion-resource.factory.test.js
 - test/utils/form-utils.service.test.js
 - test/utils/urlencode.filter.test.js
-- test/utils/as.filter.test.js
 has_rdoc: 

data/app/assets/javascripts/bastion/utils/as.filter.js

@@ -1,20 +0,0 @@
-/**
- * @ngdoc filter
- * @name Bastion.utils.filter:as
- *
- * @requires $parse
- *
- * @description
- *   Adds variable to scope with the value passed in. This allows adding to the
- *   scope a variable that contains the result of multiple applied filters.
- *
- * @example
- *   <ul>
-       <li ng-repeat="item in items | filter:customFilter | as:filteredItems"></li>
-     </ul>
- */
-angular.module('Bastion.utils').filter('as', ['$parse', function ($parse) {
-    return function (value, path) {
-        return $parse(path).assign(this, value);
-    };
-}]);

data/test/utils/as.filter.test.js

@@ -1,20 +0,0 @@
-describe('Filter:as', function() {
-    var array, scope = {};
-
-    beforeEach(module('Bastion.utils'));
-
-    beforeEach(inject(function($filter) {
-        array = [
-            {id: 1, name: 'one'},
-            {id: 2, name: 'two'},
-            {id: 3, name: 'three'}
-        ];
-        scope.asFilter = $filter('as')
-    }));
-
-    it("should set items to the value of array", function() {
-        expect(scope.asFilter(array, 'items')).toEqual(array);
-        expect(scope.items).toEqual(array);
-    });
-
-});