bastion 5.0.8 → 5.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/bastion/components/nutupane.factory.js +5 -3
- data/app/assets/stylesheets/bastion/tables.scss +0 -5
- data/app/assets/stylesheets/bastion/variables.scss +1 -1
- data/lib/bastion/version.rb +1 -1
- data/test/components/nutupane.factory.test.js +4 -0
- metadata +32 -32
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a443b729d06efdadec292b03bf9d0b4b73314bb8
|
4
|
+
data.tar.gz: 3e7d30e38d2924e4098d73a9f3a4973a47d91fb5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 77ee30e6d52efebb633181af60a3ad2722ad6f926fdfe620bd38cfa99883e8289b38b13d685ecd4ef28f6b9d3aa4890b9c180dae1e51cc4e5882e9a39de4139d
|
7
|
+
data.tar.gz: b78f699e9935a997a2379e037cd1f32a9acd2ac7ea1bd74f3e840ae8a40f95cfa1d7e6dd45a60da0af789c4c3979db5d078874255b9c9a976ca279f4fd17c609
|
@@ -30,7 +30,7 @@
|
|
30
30
|
</pre>
|
31
31
|
*/
|
32
32
|
angular.module('Bastion.components').factory('Nutupane',
|
33
|
-
['$location', '$q', 'entriesPerPage', 'TableCache', 'GlobalNotification', function ($location, $q, entriesPerPage, TableCache, GlobalNotification) {
|
33
|
+
['$location', '$q', '$stateParams', 'entriesPerPage', 'TableCache', 'GlobalNotification', function ($location, $q, $stateParams, entriesPerPage, TableCache, GlobalNotification) {
|
34
34
|
var Nutupane = function (resource, params, action, nutupaneParams) {
|
35
35
|
var self = this;
|
36
36
|
|
@@ -71,14 +71,16 @@ angular.module('Bastion.components').factory('Nutupane',
|
|
71
71
|
params: params,
|
72
72
|
resource: resource,
|
73
73
|
rows: [],
|
74
|
-
searchTerm: $location.search()[self.searchKey] || "",
|
74
|
+
searchTerm: $stateParams[self.searchKey] || $location.search()[self.searchKey] || "",
|
75
75
|
initialLoad: true
|
76
76
|
};
|
77
77
|
|
78
78
|
self.loadParamsFromExistingTable = function (existingTable) {
|
79
79
|
params = existingTable.params;
|
80
80
|
self.table.params = existingTable.params;
|
81
|
-
self.table.searchTerm
|
81
|
+
if (!self.table.searchTerm) {
|
82
|
+
self.table.searchTerm = existingTable.searchTerm;
|
83
|
+
}
|
82
84
|
};
|
83
85
|
|
84
86
|
self.load = function () {
|
data/lib/bastion/version.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
describe('Factory: Nutupane', function() {
|
2
2
|
var $timeout,
|
3
3
|
$location,
|
4
|
+
$stateParams,
|
4
5
|
$rootScope,
|
5
6
|
$q,
|
6
7
|
Resource,
|
@@ -12,6 +13,8 @@ describe('Factory: Nutupane', function() {
|
|
12
13
|
beforeEach(module('Bastion.components'));
|
13
14
|
|
14
15
|
beforeEach(module(function ($provide) {
|
16
|
+
$stateParams = {};
|
17
|
+
|
15
18
|
entriesPerPage = 20;
|
16
19
|
|
17
20
|
TableCache = {
|
@@ -23,6 +26,7 @@ describe('Factory: Nutupane', function() {
|
|
23
26
|
}
|
24
27
|
};
|
25
28
|
|
29
|
+
$provide.value('$stateParams', $stateParams);
|
26
30
|
$provide.value('entriesPerPage', entriesPerPage);
|
27
31
|
$provide.value('TableCache', TableCache);
|
28
32
|
}));
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bastion
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.0.
|
4
|
+
version: 5.0.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eric D Helms
|
@@ -9,22 +9,22 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2017-08-
|
12
|
+
date: 2017-08-18 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: angular-rails-templates
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
17
17
|
requirements:
|
18
|
-
- -
|
18
|
+
- - "~>"
|
19
19
|
- !ruby/object:Gem::Version
|
20
|
-
version: 0.
|
20
|
+
version: 1.0.2
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
|
-
- -
|
25
|
+
- - "~>"
|
26
26
|
- !ruby/object:Gem::Version
|
27
|
-
version: 0.
|
27
|
+
version: 1.0.2
|
28
28
|
- !ruby/object:Gem::Dependency
|
29
29
|
name: uglifier
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
@@ -1760,47 +1760,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1760
1760
|
version: '0'
|
1761
1761
|
requirements: []
|
1762
1762
|
rubyforge_project:
|
1763
|
-
rubygems_version: 2.
|
1763
|
+
rubygems_version: 2.5.1
|
1764
1764
|
signing_key:
|
1765
1765
|
specification_version: 4
|
1766
1766
|
summary: UI library of AngularJS based components for Foreman
|
1767
1767
|
test_files:
|
1768
|
+
- test/features/bst-feature-flag.directive.test.js
|
1769
|
+
- test/features/feature-flag.service.test.js
|
1768
1770
|
- test/auth/authorization.service.test.js
|
1769
|
-
- test/bastion/test-constants.js
|
1770
|
-
- test/components/bst-alert.directive.test.js
|
1771
|
-
- test/components/bst-alerts.directive.test.js
|
1772
|
-
- test/components/bst-bookmark.directive.test.js
|
1773
|
-
- test/components/bst-bookmark.factory.test.js
|
1774
|
-
- test/components/bst-dropdown.directive.test.js
|
1775
|
-
- test/components/bst-edit.directive.test.js
|
1776
|
-
- test/components/bst-flyout.directive.test.js
|
1777
|
-
- test/components/bst-form-buttons.directive.test.js
|
1778
1771
|
- test/components/bst-form-group.directive.test.js
|
1779
|
-
- test/components/bst-global-notification.directive.test.js
|
1780
|
-
- test/components/bst-menu.directive.test.js
|
1781
|
-
- test/components/bst-modal.directive.test.js
|
1782
1772
|
- test/components/bst-table.directive.test.js
|
1773
|
+
- test/components/page-title.directive.test.js
|
1774
|
+
- test/components/bst-menu.directive.test.js
|
1775
|
+
- test/components/bst-alerts.directive.test.js
|
1776
|
+
- test/components/nutupane.factory.test.js
|
1777
|
+
- test/components/path-selector.directive.test.js
|
1783
1778
|
- test/components/formatters/array-to-string.filter.test.js
|
1784
|
-
- test/components/formatters/
|
1779
|
+
- test/components/formatters/unlimited-filter.filter.test.js
|
1785
1780
|
- test/components/formatters/capitalize.filter.test.js
|
1786
1781
|
- test/components/formatters/key-value-to-string.filter.test.js
|
1787
|
-
- test/components/formatters/
|
1788
|
-
- test/components/global-notification.service.test.js
|
1789
|
-
- test/components/nutupane.factory.test.js
|
1790
|
-
- test/components/page-title.directive.test.js
|
1782
|
+
- test/components/formatters/boolean-to-yes-no.filter.test.js
|
1791
1783
|
- test/components/page-title.service.test.js
|
1792
|
-
- test/components/
|
1784
|
+
- test/components/bst-bookmark.factory.test.js
|
1785
|
+
- test/components/bst-alert.directive.test.js
|
1786
|
+
- test/components/bst-bookmark.directive.test.js
|
1787
|
+
- test/components/bst-global-notification.directive.test.js
|
1788
|
+
- test/components/bst-flyout.directive.test.js
|
1793
1789
|
- test/components/table-cache.service.test.js
|
1790
|
+
- test/components/bst-dropdown.directive.test.js
|
1794
1791
|
- test/components/typeahead-empty.directive.test.js
|
1795
|
-
- test/
|
1796
|
-
- test/
|
1797
|
-
- test/
|
1798
|
-
- test/
|
1792
|
+
- test/components/bst-form-buttons.directive.test.js
|
1793
|
+
- test/components/global-notification.service.test.js
|
1794
|
+
- test/components/bst-edit.directive.test.js
|
1795
|
+
- test/components/bst-modal.directive.test.js
|
1799
1796
|
- test/routing.module.test.js
|
1800
1797
|
- test/test-mocks.module.js
|
1801
|
-
- test/
|
1802
|
-
- test/
|
1798
|
+
- test/menu/menu-expander.service.test.js
|
1799
|
+
- test/i18n/translate.service.test.js
|
1800
|
+
- test/bastion/test-constants.js
|
1803
1801
|
- test/utils/form-utils.service.test.js
|
1804
|
-
- test/utils/
|
1802
|
+
- test/utils/disable-link.directive.test.js
|
1805
1803
|
- test/utils/stop-event.directive.test.js
|
1804
|
+
- test/utils/bastion-resource.factory.test.js
|
1806
1805
|
- test/utils/urlencode.filter.test.js
|
1806
|
+
- test/utils/round-up.filter.test.js
|