rocket_cms 0.8.0.pre.4 → 0.8.0.pre.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 789716626a614f49bdb9df0088fbeb82a0b3fde9
4
- data.tar.gz: b121c37bdc1d3f33cefa0a4793dc32172714c821
3
+ metadata.gz: 0278478ead1955bacae88ab8696daad16896750f
4
+ data.tar.gz: 5ee8127a336c911cb3bd7795dcf8a617df8f4df6
5
5
  SHA512:
6
- metadata.gz: 6af9640c59803b570e6fcd696b289b65869f5b5a737c2823a9a2d2657e997fb75b5d55f91cacb660e2f2b9431038109792348e71b37f04683bb170e65b40cd90
7
- data.tar.gz: 523b2f3370fbd8df243f72b19a839739cfb4faef4d1234913c9e8a047e74903f67c8c381b4fc676868c5e6b1f655d0e39626d95f3b32392b2606c53490189d8b
6
+ metadata.gz: 79b618f2fb2044f1a60e53aaf6142b530f36c2007da57d7eea374f41da89d8a4a01667d8829f5de2e61654cdda4f4e2bd9a540e1f30342cd653413472931bd29
7
+ data.tar.gz: 72a873069c40e607a0f49a9e0b5508143c5bffbdaec6fd97ebf06388de8cafe02c96841235d1bb2b5ff4bf27f9ebb20b8b7064f80547bfddc2f54d4e2712d38b
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.8.0.pre.4)
4
+ rocket_cms (0.8.0.pre.5)
5
5
  addressable
6
6
  coffee-rails
7
7
  devise
@@ -33,7 +33,7 @@ module RsErrors
33
33
  end
34
34
  end
35
35
 
36
- protected
36
+ private
37
37
  def render_404(exception = nil)
38
38
  Rails.logger.error "404: #{request.url}"
39
39
  unless exception.nil?
@@ -4,6 +4,7 @@ module RsMenu
4
4
  helper_method :navigation
5
5
  end
6
6
 
7
+ private
7
8
  def render_with_subs(items, primary, item)
8
9
  subs = items.select { |i| i.parent_id == item.id && !i.name.blank? && i.enabled }
9
10
  if subs.empty?
@@ -31,7 +32,7 @@ module RsMenu
31
32
  SimpleNavigation.config.autogenerate_item_ids = false
32
33
  begin
33
34
  nav_extra_data_before(type, primary)
34
- items = ::Menu.find(type.to_s).pages.enabled.sorted.to_a
35
+ items = nav_get_menu_items(type)
35
36
  items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }.each do |item|
36
37
  render_with_subs(items, primary, item)
37
38
  end
@@ -45,6 +46,10 @@ module RsMenu
45
46
  end
46
47
  end
47
48
 
49
+ def nav_get_menu_items(type)
50
+ ::Menu.find(type.to_s).pages.enabled.sorted.to_a
51
+ end
52
+
48
53
  def nav_extra_data_before(type, primary)
49
54
  # override for additional config or items
50
55
  end
@@ -5,7 +5,6 @@ module RsPages
5
5
  end
6
6
 
7
7
  private
8
-
9
8
  def find_page
10
9
  return if rails_admin?
11
10
  @seo_page = find_seo_page request.path
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.8.0.pre.4"
2
+ VERSION = "0.8.0.pre.5"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.0.pre.4
4
+ version: 0.8.0.pre.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-06 00:00:00.000000000 Z
11
+ date: 2015-07-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler