bastion 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjNkNjc4M2NjMDdkMDlmZDVkOTc1MTI5MTJmMTlmNWNiOGY4N2E4Nw==
+    MzVmNGUwNmI0Y2IwZTcyMTBiYmMzYWRmYjNhN2NlNTE3MjA1NGYyYg==
   data.tar.gz: !binary |-
-    YmNiMTgwNmM2ZDBhZThjNTcyOWI3NjQ5NjdhNTZhNTI0MmNlNjljNw==
+    MmZiOWE3M2U4OTFiZWU4MjEyZGU2MmYxNTk2OTIzZTIxYjk4ODZjYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTIxNGNjOTczMGQ3NGRiODA4OTFiNGU4NjNiYjk1YmY2ZTk4YmZjNmJjMWYz
-    OGJjMmU5Mzg1YTEzZGNjN2I1NGI2M2IyMmU2NTJlYmNiYmIyNDNiOTJhYjUy
-    MGJlYjljZDk4NjVmYTkyMzRmZjYyYWZiN2UxYjAxNmRkMWU3Yjk=
+    NGVmYWQ1YWZjZGYxZjI5ZTdlZTUyMjFkZTUwYzY5MTAzODcxNTk5Zjc1ZTI5
+    MTUzMDQwYmQzY2RhN2IyMGYyNTY4Y2NjNDI2MjhlNDdhZWI3MjIyNTBhODVi
+    MjliYmU4MzUxYmQ5MmMwMDczZmJlZWE1MTViNjU1YzRmZDljYjM=
   data.tar.gz: !binary |-
-    ZDA3ODRhNDdhNjkwNTE3MDkyZDQzYTlhODEyNTU5Nzk5YTA0ZjFlMWM4YzUw
-    Mzc0OWIxMDU4ZjczMzdiNWIyNjBmMWVmNGM4NTBhYTUxMWMyNjI4Y2Q0OGMx
-    YzNjMzkzMGY3Y2U3Y2NiZjU3ZWJjY2EwNjg0MDVjYzYzZjhmN2Y=
+    NWUyZTIyMmU5ZjNkMDJjOTI4MDEyMjM4ZTU2MjM3Yzc5NzQ3NWI3N2UyM2Y5
+    ZjExNjFhMDBjZjliNmJlZTZlZjhiNzEyODY4MjExZmRjODI5MzUxMTAyYzJj
+    MmYwYzI4ZGViODRkNDE1YmViYTAwNmRiN2E5NTg0MmFhOWIwOWI=

data/app/assets/javascripts/bastion/components/path-selector.directive.js

@@ -64,13 +64,16 @@ angular.module('Bastion.components').directive('pathSelector',
             }
 
             scope.itemChanged = function (item) {
-                if (item && scope.mode === 'singleSelect') {
-                    if (item.selected || selectionRequired) {
-                        unselectActive();
-                        selectById(item.id);
-                        activeItemId = item.id;
-                    } else {
-                        ngModel.$setViewValue(undefined);
+                if (item && !item.disabled) {
+                    if (scope.mode === 'singleSelect') {
+                        item.selected = !item.selected;
+                        if (item.selected || selectionRequired) {
+                            unselectActive();
+                            selectById(item.id);
+                            activeItemId = item.id;
+                        } else {
+                            ngModel.$setViewValue(undefined);
+                        }
                     }
                 }
             };

data/app/assets/javascripts/bastion/components/views/path-selector.html

@@ -1,9 +1,9 @@
 
 <div class="path-selector" ng-repeat="path in paths">
   <ul class="path-list">
-    <li class="path-list-item" ng-repeat="item in path" ng-class="{ 'disabled-item': item.disabled }">
+    <li class="path-list-item" ng-click="itemChanged(item)" ng-repeat="item in path" ng-class="{ 'disabled-item': item.disabled }">
       <label class="path-list-item-label" ng-disabled="item.disabled" ng-class="{ active: item.selected }" ng-mouseenter="hover" ng-mouseleave="hover = false">
-        <input type="checkbox" ng-model="item.selected" ng-change="itemChanged(item)" ng-disabled="item.disabled"/>
+        <input type="checkbox" ng-model="item.selected" ng-checked="item.selected" ng-disabled="item.disabled"/>
         {{ item.name }}
       </label>
     </li>

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

@@ -21,15 +21,13 @@
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
-    angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
+    angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
     angular.module('Bastion').value('CurrentUser', {
       id: <%= User.current.id %>,
       admin: <%= User.current.admin %>
     });
     angular.module('Bastion').value('markActiveMenu', mark_active_menu);
-    angular.module('Bastion').constant('BastionConfig', {
-        markTranslated: <%= SETTINGS[:mark_translated] || false %>
-    });
+    angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
   </script>
   <% Bastion.plugins.each do |name, plugin| %>
     <%= javascript_include_tag(plugin[:javascript]) %>

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/bastion.rb

@@ -18,4 +18,16 @@ module Bastion
     @@plugins[plugin[:name]] = plugin
   end
 
+  def self.config
+    base_config = {
+      'markTranslated' => SETTINGS[:mark_translated] || false
+    }
+
+    Bastion.plugins.each do |name, plugin|
+      base_config.merge!(plugin[:config]) if plugin[:config]
+    end
+
+    base_config
+  end
+
 end

data/test/components/path-selector.directive.test.js

@@ -72,12 +72,9 @@ describe('Directive: pathSelector', function() {
     });
 
     it("should select both items if two items with the same id exist", function() {
-        var checkbox = element.find('.path-list:first .path-list-item:first').find('input');
-
-        checkbox.trigger('click');
-        checkbox.attr('checked', 'checked');
-        checkbox.prop('checked', true);
+        var path = element.find('.path-list:first .path-list-item:first');
 
+        path.trigger('click');
         expect(element.find('.path-list:eq(1)').find('.path-list-item:first input').is(':checked')).toBe(true);
     });
 
@@ -104,14 +101,15 @@ describe('Directive: pathSelector', function() {
     });
 
     it ("should not unselect by default", function () {
-        var checkbox = element.find('.path-list:first .path-list-item:first').find('input');
+        var path = element.find('.path-list:first .path-list-item:first'),
+            checkbox = path.find('input');
 
         expect(checkbox.is(':checked')).toBe(false);
 
-        checkbox.click();
+        path.click();
         expect(checkbox.is(':checked')).toBe(true);
 
-        checkbox.click();
+        path.click();
         expect(checkbox.is(':checked')).toBe(true);
     });
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Katello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates