camaleon_cms 0.1.5 → 0.1.6

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: 322873a45ef38a4a4f83887f1963bfe55e2b7ab4
4
- data.tar.gz: 87a4662b7f099b0f8e1ef8606a56f0794935409b
3
+ metadata.gz: 62fc7ad41d7bb84eb19b420320039004edf012ba
4
+ data.tar.gz: fed0f9bc7a3ea5b624eba15c41c8f28f15ac7b39
5
5
  SHA512:
6
- metadata.gz: d3c6e1be0f889d9e35821c42415c005caaa1796c6ea98cecfe26ffafa6e88744c27b58d9bd3a3bd383e8edf26170041cef4825de500918cc396eb44d22340e21
7
- data.tar.gz: 6701d5ff639c44fbe9fbec821b605e2d02789127d56c7568206070067963aa7814283f612521d60dc7d35ecf1e984c2a14a2d5f1fc4192e1dba32d0b49fb241d
6
+ metadata.gz: 726e598be6d038d1f63a3abad00fac9b79d94c0162716cbf31153f4919fb2d7b797c312e3c0522dede7318c016182ab3411893802b4b60bc327cac97ab171067
7
+ data.tar.gz: afc6f987d85a6e649310b6ff49b7c5720fa4fc596efeb18f35d9daf3564aa6de159a8881181bea1cc5653b3b08a846b039e7b3e58b0f8bb2ffb9dd5178dc0fda
@@ -94,16 +94,16 @@ class CamaleonController < ApplicationController
94
94
  self.prepend_view_path(File.join($camaleon_engine_dir, "app", "views", 'default_theme'))
95
95
  self.prepend_view_path(Rails.root.join("app", "views", 'default_theme'))
96
96
 
97
- if current_theme.present?
98
- views_dir = "app/apps/themes/#{current_theme.slug}/views"
99
- self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
100
- self.prepend_view_path(Rails.root.join(views_dir).to_s)
101
- end
102
-
103
97
  if current_site.present?
104
98
  views_site_dir = "app/apps/themes/#{current_site.id}/views"
105
99
  self.prepend_view_path(File.join($camaleon_engine_dir, views_site_dir).to_s)
106
100
  self.prepend_view_path(Rails.root.join(views_site_dir).to_s)
101
+
102
+ if current_theme.present?
103
+ views_dir = "app/apps/themes/#{current_theme.slug}/views"
104
+ self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
105
+ self.prepend_view_path(Rails.root.join(views_dir).to_s)
106
+ end
107
107
  end
108
108
  end
109
109
 
@@ -7,9 +7,11 @@
7
7
  See the GNU Affero General Public License (GPLv3) for more details.
8
8
  =end
9
9
  # load all custom initializers of plugins or themes
10
- PluginRoutes.all_enabled_apps.each do |ap|
11
- if ap["path"].present?
12
- f = File.join(ap["path"], "config", "initializer.rb")
13
- eval(File.read(f)) if File.exist?(f)
10
+ if defined?(PluginRoutes)
11
+ PluginRoutes.all_enabled_apps.each do |ap|
12
+ if ap["path"].present?
13
+ f = File.join(ap["path"], "config", "initializer.rb")
14
+ eval(File.read(f)) if File.exist?(f)
15
+ end
14
16
  end
15
17
  end
@@ -1,3 +1,3 @@
1
1
  module CamaleonCms
2
- VERSION = "0.1.5"
2
+ VERSION = "0.1.6"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: camaleon_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Owen Peredo Diaz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-29 00:00:00.000000000 Z
11
+ date: 2015-08-31 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Camaleon CMS is a dynamic and advanced content management system based
14
14
  on Ruby on Rails 4 as an alternative to Wordpress.