bastion 0.2.8 → 0.2.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/app/views/bastion/layouts/application.html.erb +3 -4
- data/lib/bastion/engine.rb +8 -1
- data/lib/bastion/version.rb +1 -1
- data/lib/bastion.rb +4 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
YWE4MDllZDc1NzlmZTgwMDczYmIwY2UyYzYzMDlkYTE4ZWMwNWQ3Nw==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
M2UzNjdlM2FjZmMzNWJlN2Q3MDUyYzUxMjkzMzE4MmNjMTU1MTk5OA==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
ZTYyOTU1YjE5OGFmMTk4M2FmNGQ1YmE5ZjQ2MzRmN2VjNjI2ZjIyYjUxYjk3
|
|
10
|
+
ZmQ3YjMyOGQyMDcyN2ViNTk4YThlYmI0NGYzNDQ3Njk1MWMyMTdlZDMzMzU2
|
|
11
|
+
YWFjYjBkNzY1MjJhMTc1OGU4M2U3ODM3YzY1YWY0YjMzZmZkYmM=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
MjljZTBkMDZkODU0ZmU5MzI3ZWNjNzIzNTE5YjA2MmU4NDgxMTMxMzY2NDQ3
|
|
14
|
+
ZGViY2E4OGU5OTI3YjQ2NzY5YjQxYzlkZWQ0YmIxMjVkMzJjZGM5NWZlMjY2
|
|
15
|
+
MDhjYTllYmRhNWJmZmVkODBiNmUyZDY2ZmY1OTY2OWQ0YjBjMzI=
|
|
@@ -17,9 +17,8 @@
|
|
|
17
17
|
|
|
18
18
|
<% content_for(:javascripts) do %>
|
|
19
19
|
<%= javascript_include_tag 'bastion/bastion' %>
|
|
20
|
-
<%
|
|
21
|
-
|
|
22
|
-
<%= javascript_include_tag(localization_path) %>
|
|
20
|
+
<% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path(I18n.locale)}") %>
|
|
21
|
+
<%= javascript_include_tag(Bastion.localization_path(I18n.locale)) %>
|
|
23
22
|
<% end %>
|
|
24
23
|
<script type="text/javascript">
|
|
25
24
|
angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
|
|
@@ -28,7 +27,7 @@
|
|
|
28
27
|
angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
|
|
29
28
|
angular.module('Bastion').value('CurrentUser', {
|
|
30
29
|
id: <%= User.current.id %>,
|
|
31
|
-
admin: <%= User.current.admin %>
|
|
30
|
+
admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
|
|
32
31
|
});
|
|
33
32
|
angular.module('Bastion').value('markActiveMenu', mark_active_menu);
|
|
34
33
|
angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
|
data/lib/bastion/engine.rb
CHANGED
|
@@ -27,8 +27,15 @@ module Bastion
|
|
|
27
27
|
|
|
28
28
|
SETTINGS[:bastion][:assets][:precompile] = [
|
|
29
29
|
'bastion/bastion.css',
|
|
30
|
-
'bastion/bastion.js'
|
|
30
|
+
'bastion/bastion.js',
|
|
31
31
|
]
|
|
32
|
+
|
|
33
|
+
locale_files = Dir.glob("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path("*")}")
|
|
34
|
+
locale_files.map do |file|
|
|
35
|
+
file.gsub!("#{Bastion::Engine.root}/vendor/assets/javascripts/", "")
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
SETTINGS[:bastion][:assets][:precompile].concat(locale_files)
|
|
32
39
|
end
|
|
33
40
|
|
|
34
41
|
initializer "angular_templates", :group => :all do |app|
|
data/lib/bastion/version.rb
CHANGED
data/lib/bastion.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bastion
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Katello
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-03-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: angular-rails-templates
|