bastion 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTdlZjMxMWFmMTVkZTdhNmQ0MTg0ZGVkZTE2ZGExMjkxZGU1ZWUxNA==
+    YWE4MDllZDc1NzlmZTgwMDczYmIwY2UyYzYzMDlkYTE4ZWMwNWQ3Nw==
   data.tar.gz: !binary |-
-    MGMzMTBiN2UzZWU2OTE5ODU5ZjVlZWFmNDQ0YmNmOGFjMjI0YTJhMg==
+    M2UzNjdlM2FjZmMzNWJlN2Q3MDUyYzUxMjkzMzE4MmNjMTU1MTk5OA==
 SHA512:
   metadata.gz: !binary |-
-    MmVkMzZiNzcyY2VhMGRhZDJmZWJjNTk2Nzk4MTYwNmUxYWQ0ODEwN2UxZjM2
-    MzBkNTk1ZjkyMmUwYWNmZDRlNjI1MTI2ZGJiOTY1YzA3ZGJhN2IyODVjNjU2
-    ZDM4YTk2NDJmMzVkMWE4NTkxZDQxNjNmN2JiMzllODU0ZWUwZDY=
+    ZTYyOTU1YjE5OGFmMTk4M2FmNGQ1YmE5ZjQ2MzRmN2VjNjI2ZjIyYjUxYjk3
+    ZmQ3YjMyOGQyMDcyN2ViNTk4YThlYmI0NGYzNDQ3Njk1MWMyMTdlZDMzMzU2
+    YWFjYjBkNzY1MjJhMTc1OGU4M2U3ODM3YzY1YWY0YjMzZmZkYmM=
   data.tar.gz: !binary |-
-    MzIxYzM2NWQ2YmQ5N2E3NDQ4YmM4OTUwMzAyNmIwYTA3NjcyZDMwZjBiMTI0
-    NjRmYzQzOGUzYzMzMjgzMzFlMzllM2JhODEwOGMwMDQ2ZWYyNTRmNWI5ZDg4
-    YzM5ZDIxNDczNjlmNmU0Zjc5OWE3OTBiYjJiMDFhZTExYzBkM2U=
+    MjljZTBkMDZkODU0ZmU5MzI3ZWNjNzIzNTE5YjA2MmU4NDgxMTMxMzY2NDQ3
+    ZGViY2E4OGU5OTI3YjQ2NzY5YjQxYzlkZWQ0YmIxMjVkMzJjZGM5NWZlMjY2
+    MDhjYTllYmRhNWJmZmVkODBiNmUyZDY2ZmY1OTY2OWQ0YjBjMzI=

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

@@ -17,9 +17,8 @@
 
 <% content_for(:javascripts) do %>
   <%= javascript_include_tag 'bastion/bastion' %>
-  <% localization_path = "bastion/angular-i18n/angular-locale_#{I18n.locale}.js" %>
-  <% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{localization_path}") %>
-    <%= javascript_include_tag(localization_path) %>
+  <% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path(I18n.locale)}") %>
+    <%= javascript_include_tag(Bastion.localization_path(I18n.locale)) %>
   <% end %>
   <script type="text/javascript">
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
@@ -28,7 +27,7 @@
     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 %>
+      admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
     });
     angular.module('Bastion').value('markActiveMenu', mark_active_menu);
     angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));

data/lib/bastion/engine.rb

@@ -27,8 +27,15 @@ module Bastion
 
       SETTINGS[:bastion][:assets][:precompile] = [
         'bastion/bastion.css',
-        'bastion/bastion.js'
+        'bastion/bastion.js',
       ]
+
+      locale_files = Dir.glob("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path("*")}")
+      locale_files.map do |file|
+        file.gsub!("#{Bastion::Engine.root}/vendor/assets/javascripts/", "")
+      end
+
+      SETTINGS[:bastion][:assets][:precompile].concat(locale_files)
     end
 
     initializer "angular_templates", :group => :all do |app|

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/bastion.rb

@@ -30,4 +30,8 @@ module Bastion
     base_config
   end
 
+  def self.localization_path(locale)
+    "bastion/angular-i18n/angular-locale_#{locale}.js"
+  end
+
 end

metadata

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