express_admin 1.7.27 → 1.7.28

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d1a10bf410c0e2d08756531f963dd722c22b328f
4
- data.tar.gz: 15b6feeef65c8452edf48d4d9b60386556b40ebc
3
+ metadata.gz: b516340a35967fe889a0b444dbcaffba32b37391
4
+ data.tar.gz: 48d9ed2620e2d914b96341a1270702133964dc83
5
5
  SHA512:
6
- metadata.gz: e7d81d053ca6c36ef11dd11396fc2c2309c192278377a1f57a838d788d0fa9bcff49ad216743ca944e9be22459c24f5dc8ada0ace2f6e280d667daa72117c83a
7
- data.tar.gz: 4c67126e638192e99a320e6bd153d0286c8952dd8e1a6289e4993c6f72efd8c2b17ecb2bc7259a8deda51c620ba185aec44d9aff823ce7fce1ee503429ffac41
6
+ metadata.gz: 29a40ae6919f23c5b068bfe2a147b1ae556b7f0daddc70397bf3d46c7a56db2e7aed2c048b5af549dd8f172ef9bf08ff66118a19d91f325a8d3adde102d2d844
7
+ data.tar.gz: 2520ed01ae603ca06d3d83c5ad67844a4df190f2e588698de9ed213f8271cbf6657eada3892be8836987f6b93760baa13c13fb5c900c34b37231b510a52acb39
data/MIT-LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright 2014 YOURNAME
1
+ Copyright (c) 2014-2016 AELOGICA, LLC
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
@@ -74,7 +74,8 @@ module ExpressAdmin
74
74
 
75
75
  def admin_javascript_and_css_includes(admin_path = nil)
76
76
  current_module_path = current_module.to_s.underscore
77
- admin_path ||= current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
77
+ addon = Gem.loaded_specs[current_module_path]
78
+ admin_path ||= addon ? "#{current_module_path}/admin" : "admin"
78
79
  a = []
79
80
  a << stylesheet_link_tag("#{admin_path}")
80
81
  a << javascript_include_tag("express_admin", 'data-turbolinks-track' => true)
@@ -27,11 +27,10 @@ module ExpressAdmin
27
27
  @menus ||= {}
28
28
  @menus[addon_name.to_sym] ||= begin
29
29
  menu_yml_path =
30
- if addon_name.eql?('admin')
31
- File.join(Rails.root, 'config', 'menu.yml')
30
+ if addon = Gem.loaded_specs[addon_name]
31
+ File.join(addon.full_gem_path, 'config', 'menu.yml')
32
32
  else
33
- addon_path = Gem.loaded_specs[addon_name].full_gem_path if addon_name.to_s.match(/^\w+$/)
34
- File.join(addon_path, 'config', 'menu.yml')
33
+ File.join(Rails.root, 'config', 'menu.yml')
35
34
  end
36
35
  from(menu_yml_path)
37
36
  end
@@ -1,3 +1,3 @@
1
1
  module ExpressAdmin
2
- VERSION = "1.7.27"
2
+ VERSION = "1.7.28"
3
3
  end
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: express_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.27
4
+ version: 1.7.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steven Talcott Smith
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-29 00:00:00.000000000 Z
11
+ date: 2016-02-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: express_templates