activeadmin-selleo-cms 0.0.26 → 0.0.27

data/app/controllers/pages_controller.rb

@@ -35,7 +35,7 @@ class PagesController < CmsController
   def index
     respond_to do |format|
       format.html { redirect_to page_path(I18n.locale, ActiveadminSelleoCms::Page.root) }
-      format.json { render text: ActiveadminSelleoCms::Page.published.reorder("lft ASC").map{|p| [p.to_label, p.url(locale: false)]}.to_json }
+      format.json { render text: ActiveadminSelleoCms::Page.published.reorder("lft ASC").map{|p| [p.to_label, with_host(p.url(locale: false))]}.to_json }
     end
   end
 end

data/app/helpers/pages_helper.rb

@@ -1,17 +1,21 @@
 module PagesHelper
   def link_to_locale(link_name, locale, page=nil)
     if page
-      link_to link_name, url_to_page(page, locale.to_s)
+      link_to link_name, with_host(url_to_page(page, locale.to_s))
     elsif request.fullpath.match(/^\/\w{2}\/.*/)
-      link_to link_name, request.fullpath.gsub(/^\/(\w{2})\//, "/#{locale.code}/")
+      link_to link_name, with_host(request.fullpath.gsub(/^\/(\w{2})\//, "/#{locale.code}/"))
     else
-      link_to link_name, "/#{locale.code}"
+      link_to link_name, with_host("/#{locale.code}")
     end
   end
 
+  def with_host(relative_path)
+    "#{request.protocol}#{request.host_with_port}#{relative_path}"
+  end
+
   def link_to_search_result(result)
     if result.is_a? ActiveadminSelleoCms::Page
-      "#{link_to result.breadcrumb, result.url} #{link_to "(e)", edit_admin_page_path(result.id), target: '_blank' if current_user}".html_safe
+      "#{link_to result.breadcrumb, with_host(result.url)} #{link_to "(e)", edit_admin_page_path(result.id), target: '_blank' if current_user}".html_safe
     end
   end
 
@@ -19,13 +23,13 @@ module PagesHelper
     return "#" unless page
     _locale = I18n.locale
     I18n.locale = locale
-    _url = page.url
+    _url = with_host(page.url)
     I18n.locale = _locale
     return _url
   end
 
   def link_to_page(page, link_name=nil, options={})
-    link_to (link_name || page.title), page.url, options
+    link_to (link_name || page.title), with_host(page.url), options
   end
 
   def s(name)

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails