You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2013/03/07 00:50:01 UTC
[1/3] git commit: CIMI: Fix 'views' folder location
CIMI: Fix 'views' folder location
In CIMI we don't have views except the error ones.
Signed-off-by: Michal fojtik <mf...@redhat.com>
TrackedAt: http://tracker.deltacloud.org/patch/3a9616ced9f3f313345ef2ac7f3e398a0c07f265
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/778f3a80
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/778f3a80
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/778f3a80
Branch: refs/heads/master
Commit: 778f3a801b658e898e637950d000784bd2ef2b82
Parents: c7f4d02
Author: Michal Fojtik <mf...@redhat.com>
Authored: Fri Mar 1 11:46:44 2013 +0100
Committer: David Lutterkort <lu...@redhat.com>
Committed: Wed Mar 6 14:35:39 2013 -0800
----------------------------------------------------------------------
server/lib/cimi/collections/base.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/778f3a80/server/lib/cimi/collections/base.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/collections/base.rb b/server/lib/cimi/collections/base.rb
index eac1c70..1e49ea3 100644
--- a/server/lib/cimi/collections/base.rb
+++ b/server/lib/cimi/collections/base.rb
@@ -44,8 +44,8 @@ module CIMI::Collections
set :root_path, config.root_url
set :version, config.version
set :root, File.join(File.dirname(__FILE__), '..', '..', '..')
- set :views, root + '/views/cimi'
- set :public_folder, root + '/public'
+ set :views, File.join(root, 'views')
+ set :public_folder, File.join(root, 'public')
set :documentation_class, CIMI
set :haml, :format => :xhtml