bastion 3.4.3 → 3.4.4
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a229fca51784b8e24bb42906003c5f22179f5e25
|
|
4
|
+
data.tar.gz: 290ec8bd5ef199dfde416ba44a6c92c1735f62db
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9e5e9e402171c6a0671b1e9b2ec79b54222f5b59225b0736cca7536d71ec96b08bab6508aa92ded37627aeee241345b114fd154d856be033e158d442fed1d9e0
|
|
7
|
+
data.tar.gz: 7a86014b79b32e81f8f8853b96d5a4e3cbb76c7afe056a8b2172f2af4463ca92b09b56d625d27f20ed9ee1a6d637acf8378960146e32f8556c99cbc2a615d9de
|
|
@@ -70,14 +70,15 @@ angular.module('Bastion').config(
|
|
|
70
70
|
* @requires currentLocale
|
|
71
71
|
* @requires $location
|
|
72
72
|
* @requires $window
|
|
73
|
+
* @requires $breadcrumb
|
|
73
74
|
* @requires PageTitle
|
|
74
75
|
* @requires markActiveMenu
|
|
75
76
|
*
|
|
76
77
|
* @description
|
|
77
78
|
* Set up some common state related functionality and set the current language.
|
|
78
79
|
*/
|
|
79
|
-
angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextCatalog', 'currentLocale', '$location', '$window', 'PageTitle', 'markActiveMenu',
|
|
80
|
-
function ($rootScope, $state, $stateParams, gettextCatalog, currentLocale, $location, $window, PageTitle, markActiveMenu) {
|
|
80
|
+
angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextCatalog', 'currentLocale', '$location', '$window', '$breadcrumb', 'PageTitle', 'markActiveMenu',
|
|
81
|
+
function ($rootScope, $state, $stateParams, gettextCatalog, currentLocale, $location, $window, $breadcrumb, PageTitle, markActiveMenu) {
|
|
81
82
|
var fromState, fromParams, orgSwitcherRegex;
|
|
82
83
|
|
|
83
84
|
$rootScope.$state = $state;
|
|
@@ -132,8 +133,11 @@ angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextC
|
|
|
132
133
|
|
|
133
134
|
// Prevent angular from handling org/location switcher URLs
|
|
134
135
|
orgSwitcherRegex = new RegExp("/(organizations|locations)");
|
|
135
|
-
$rootScope.$on('$locationChangeStart', function (event, newUrl) {
|
|
136
|
-
|
|
136
|
+
$rootScope.$on('$locationChangeStart', function (event, newUrl, oldUrl) {
|
|
137
|
+
// do not handle links when leaving smart proxies page
|
|
138
|
+
var proxiesRegex = /smart_proxies/;
|
|
139
|
+
var condition = newUrl.match(orgSwitcherRegex) || (oldUrl.match(proxiesRegex) && !newUrl.match(proxiesRegex));
|
|
140
|
+
if (condition) {
|
|
137
141
|
event.preventDefault();
|
|
138
142
|
$window.location.href = newUrl;
|
|
139
143
|
}
|
|
@@ -14,6 +14,12 @@
|
|
|
14
14
|
</div>
|
|
15
15
|
</div>
|
|
16
16
|
|
|
17
|
+
<div class="row">
|
|
18
|
+
<header class="col-sm-12">
|
|
19
|
+
<span data-block="sub-header"></span>
|
|
20
|
+
</header>
|
|
21
|
+
</div>
|
|
22
|
+
|
|
17
23
|
<div class="row">
|
|
18
24
|
<div class="col-sm-12 page-content">
|
|
19
25
|
<div ng-hide="page && (page.loading || page.error)">
|
|
@@ -5,38 +5,40 @@
|
|
|
5
5
|
</div>
|
|
6
6
|
</div>
|
|
7
7
|
|
|
8
|
-
<div
|
|
9
|
-
<div class="
|
|
10
|
-
<
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
<
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
<
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
8
|
+
<div data-block="search">
|
|
9
|
+
<div class="col-sm-3">
|
|
10
|
+
<div class="input-group">
|
|
11
|
+
<input type="text"
|
|
12
|
+
class="form-control"
|
|
13
|
+
placeholder="{{ 'Filter...' | translate }}"
|
|
14
|
+
bst-on-enter="table.search(table.searchTerm)"
|
|
15
|
+
ng-model="table.searchTerm"
|
|
16
|
+
ng-trim="false"
|
|
17
|
+
typeahead="item.label for item in table.autocomplete($viewValue)"
|
|
18
|
+
typeahead-empty
|
|
19
|
+
typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
|
|
20
|
+
<span class="input-group-btn">
|
|
21
|
+
<button class="btn btn-default"
|
|
22
|
+
type="button"
|
|
23
|
+
ng-click='table.search("") && (table.searchCompleted = false)'
|
|
24
|
+
ng-show="table.searchCompleted && table.searchTerm">
|
|
25
|
+
<i class="fa fa-times"></i>
|
|
26
|
+
</button>
|
|
27
|
+
<button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button">
|
|
28
|
+
<span translate>Search</span>
|
|
29
|
+
</button>
|
|
30
|
+
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
|
|
31
|
+
<i class="fa fa-caret-down"></i>
|
|
32
|
+
</button>
|
|
33
|
+
<ul bst-bookmark controller-name="controllerName" query="table.searchTerm" class="dropdown-menu pull-right"></ul>
|
|
34
|
+
</span>
|
|
35
|
+
|
|
36
|
+
</div>
|
|
35
37
|
</div>
|
|
36
|
-
</div>
|
|
37
38
|
|
|
38
|
-
|
|
39
|
-
|
|
39
|
+
<div class="col-sm-3">
|
|
40
|
+
<span translate>Showing {{ table.rows.length }} of {{ table.resource.subtotal }} ({{ table.resource.total }} Total)</span>
|
|
41
|
+
</div>
|
|
40
42
|
</div>
|
|
41
43
|
|
|
42
44
|
<div class="fr">
|
|
@@ -56,7 +58,7 @@
|
|
|
56
58
|
</div>
|
|
57
59
|
|
|
58
60
|
<div class="row nutupane" bst-table="table" nutupane-table>
|
|
59
|
-
<div class="loading-mask" ng-show="table.refreshing" >
|
|
61
|
+
<div class="loading-mask" ng-show="table.refreshing || table.working" >
|
|
60
62
|
<i class="fa fa-spinner fa-spin"></i>
|
|
61
63
|
<span>{{ "Loading..." | translate }}</span>
|
|
62
64
|
</div>
|
data/lib/bastion/version.rb
CHANGED
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: 3.4.
|
|
4
|
+
version: 3.4.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Eric D Helms
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2016-11-
|
|
12
|
+
date: 2016-11-18 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: angular-rails-templates
|