bastion 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a08480ce9af5a24a9dbfde880112f349598c8e
-  data.tar.gz: 8f663bd988ae4e38f1f5b19184ede517a0a27066
+  metadata.gz: f40e45968eef402e29e6881759d26a013a601dcc
+  data.tar.gz: 605dc9d2da6569ecdb79418c2546b74bac899cba
 SHA512:
-  metadata.gz: 585adde75417edb16b62fb9ec477582e4c803c8b56cff3a46e15c2707e38ef86f644e6890777d3cd08890aa38e0a8421b648f4eea194791a1fdaa4e48121f3e3
-  data.tar.gz: 9c7e4415c5251dab68fd32e25d9976d5dbe3530f6dfd89c5f770ef5f354a7428fcf97e69e71d8fa397f3ed763c33f344e490e30b44486bd4cb79e295bb960a1c
+  metadata.gz: 51c603a77faa26e724ff788b533b98c250d07a42d03c57df783539a3657a1d75f3838a7106c30f95b6b939db7987d0466be2c630d10aab4398543cb46f5c8315
+  data.tar.gz: 69dfb2786cb0556947b2b773ea689a24b69894e2888c33f4112d8a1ef380d27f79a79399f55fc9e841aa70ea7602c8bc6a1823017a7251259589d34ea6467561

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

@@ -15,17 +15,21 @@ angular.module('Bastion.components').directive('bstModal',
         scope: {
             action: '&bstModal',
             modelName: '@model',
-            model: '='
+            model: '=',
+            templateUrl: '@'
         },
-        compile: function(tElement) {
-            var template = angular.element('<div extend-template="components/views/bst-modal.html"></div>'), modalId;
+        compile: function(tElement, tAttrs) {
+            var template = angular.element('<div extend-template="components/views/bst-modal.html"></div>'),
+                templateUrl = tAttrs.templateUrl;
 
-            template.append(tElement.children());
-            tElement.html('');
-            tElement = angular.element(template);
+            if (!templateUrl) {
+                template.append(tElement.children());
+                tElement.html('');
+                tElement = angular.element(template);
 
-            modalId = 'bstModal%d.html'.replace('%d', Math.random().toString());
-            $templateCache.put(modalId, tElement);
+                templateUrl = 'bstModal%d.html'.replace('%d', Math.random().toString());
+                $templateCache.put(templateUrl, tElement);
+            }
 
             return function (scope) {
                 var modalInstance, modalController;
@@ -44,7 +48,7 @@ angular.module('Bastion.components').directive('bstModal',
 
                 scope.openModal = function () {
                     modalInstance = $uibModal.open({
-                        templateUrl: modalId,
+                        templateUrl: templateUrl,
                         controller: modalController,
                         resolve: {
                             model: function () {

data/app/assets/javascripts/bastion/components/views/bst-modal.html

@@ -9,8 +9,10 @@
   <p data-block="modal-body"></p>
 </div>
 <div class="modal-footer">
-  <button class="btn btn-danger" ng-click="ok()">
-    <span data-block="modal-confirm-button" translate>Remove</span>
-  </button>
-  <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>
+  <div data-block="modal-footer">
+    <button class="btn btn-danger" ng-click="ok()">
+      <span data-block="modal-confirm-button" translate>Remove</span>
+    </button>
+    <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>
+  </div>
 </div>

data/app/assets/javascripts/bastion/routing.module.js

@@ -14,7 +14,7 @@ angular.module('Bastion.routing', ['ui.router']);
      *   Routing configuration for Bastion.
      */
     function bastionRouting($stateProvider, $urlRouterProvider, $locationProvider) {
-        var oldBrowserBastionPath = '/bastion#', getRootPath;
+        var oldBrowserBastionPath = '/bastion#', getRootPath, shouldRemoveTrailingSlash;
 
         getRootPath = function (path) {
             var rootPath = null;
@@ -25,6 +25,16 @@ angular.module('Bastion.routing', ['ui.router']);
             return rootPath;
         };
 
+        shouldRemoveTrailingSlash = function (path) {
+            var whiteList = ['pulp'], remove = true;
+
+            if (path.split('/')[1] && whiteList.indexOf(path.split('/')[1]) >= 0) {
+                remove = false;
+            }
+
+            return remove;
+        };
+
         $stateProvider.state('404', {
             permission: null,
             templateUrl: 'layouts/404.html'
@@ -39,8 +49,8 @@ angular.module('Bastion.routing', ['ui.router']);
                 $window.location.href = oldBrowserBastionPath + $location.path();
             }
 
-            // removing trailing slash to prevent endless redirect
-            if (path[path.length - 1] === '/') {
+            // removing trailing slash to prevent endless redirect if not in ignore list
+            if (path[path.length - 1] === '/' && shouldRemoveTrailingSlash(path)) {
                 return path.slice(0, -1);
             }
         });

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/test/components/bst-modal.directive.test.js

@@ -74,4 +74,18 @@ describe('Directive: bstModal', function() {
 
         expect($uibModal.open).toHaveBeenCalled();
     });
+    
+    it("allows the specification of a modal templateUrl", function() {
+        var html = '<span bst-modal="item.delete(item)" template-url="blah.html"></span>';
+
+        element = angular.element(html);
+        compile(element)(scope);
+        scope.$digest();
+
+        spyOn($uibModal, 'open').and.callThrough();
+
+        elementScope.openModal();
+
+        expect($uibModal.open.calls.mostRecent().args[0].templateUrl).toBe('blah.html');
+    });
 });

data/test/routing.module.test.js

@@ -35,6 +35,11 @@ describe('config: Bastion.routing', function () {
             goTo('/state///');
             expect($window.location.href).toBe('http://server/state');
         });
+
+        it("doesn't remove slashes if whitelisted", function () {
+            goTo('/pulp/repos/');
+            expect($window.location.href).toBe('http://server/pulp/repos/');
+        });
     });
 
     describe("provides an otherwise method that", function () {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -29,14 +29,14 @@ dependencies:
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Bastion provides a UI library of AngularJS based components designed
@@ -48,8 +48,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".eslintignore"
-- ".jshintrc"
+- .eslintignore
+- .jshintrc
 - Gruntfile.js
 - LICENSE
 - README.md
@@ -1749,17 +1749,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: UI library of AngularJS based components for Foreman