bastion 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7729db238b36593ee32fbb0c4292d496ec25a99e
-  data.tar.gz: 96f7b052e48d8b040dd4295b6c05d7df6c3e0023
+  metadata.gz: 83a91798e5c6d38cfe9a0ffd70d52f3103eec19c
+  data.tar.gz: 103c5dd8c93b2a8e2c6fe67e5adbfb45ae9b45b2
 SHA512:
-  metadata.gz: cde5fb451f1ffcd5b3e10d5a38150ae92377adc37f15a22317d9f45c61bed2f4a6d65e23ab82dd3a365c93b4a558936a5731092fc377609baaab3e051322c941
-  data.tar.gz: 9c8206065bef6a78f548009b07f6af768d097bf30e86b113b297a1962528e515e7088c493d621f04b6929fefb3802f583a6d879eb558f01d1c3f972db96e57b8
+  metadata.gz: 30fd015d73c045b32ec53b481f5da69eedf9e31199f5736b2676c847fff8a7d776a5477a5c025685188b1eee6e475073648fffb9d584f695df940dae7989caf5
+  data.tar.gz: 383f060d5c021969f800e2e87dc63504a55210948663c1440d4d11f530c2f0e66ee0debb0e624bbdcf41345cf36569c4b140f075039ca46a955fbbc9c7f42797

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

@@ -75,14 +75,13 @@ angular.module('Bastion').config(
  * @requires $window
  * @requires $breadcrumb
  * @requires PageTitle
- * @requires markActiveMenu
  * @requires BastionConfig
  *
  * @description
  *   Set up some common state related functionality and set the current language.
  */
-angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextCatalog', 'currentLocale', '$location', '$window', '$breadcrumb', 'PageTitle', 'markActiveMenu', 'BastionConfig',
-    function ($rootScope, $state, $stateParams, gettextCatalog, currentLocale, $location, $window, $breadcrumb, PageTitle, markActiveMenu, BastionConfig) {
+angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextCatalog', 'currentLocale', '$location', '$window', '$breadcrumb', 'PageTitle', 'BastionConfig',
+    function ($rootScope, $state, $stateParams, gettextCatalog, currentLocale, $location, $window, $breadcrumb, PageTitle, BastionConfig) {
         var fromState, fromParams, orgSwitcherRegex;
 
         $rootScope.$state = $state;
@@ -129,9 +128,6 @@ angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextC
                 if (PageTitle.titles.length > 1) {
                     PageTitle.resetToFirst();
                 }
-
-                //Set the active menu item in Foreman
-                markActiveMenu();
             }
         );
 

data/app/views/bastion/layouts/assets.html.erb

@@ -22,7 +22,6 @@
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
     angular.module('Bastion').value('contentAccessMode', "<%= Organization.current.try(:content_access_mode) if Organization.current %>");
     angular.module('Bastion').value('foreman', tfm);
-    angular.module('Bastion').value('markActiveMenu', mark_active_menu);
     angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
     angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
     angular.module('Bastion.auth').value('CurrentUser', {

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "6.1.1"
+  VERSION = "6.1.2"
 end

data/test/bastion/test-constants.js

@@ -4,7 +4,6 @@ angular.module('Bastion').value('CurrentOrganization', "ACME");
 angular.module('Bastion').value('Authorization', {});
 angular.module('Bastion').value('entriesPerPage', 20);
 angular.module('Bastion').value('PageTitle', 'Bastion Page');
-angular.module('Bastion').value('markActiveMenu', function () {});
 angular.module('Bastion').value('foreman', function () {});
 angular.module('Bastion').constant('BastionConfig', {
     consumerCertRPM: "consumer_cert_rpm",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates