app/helpers/pages_helper.rb in activeadmin-selleo-cms-0.0.18 vs app/helpers/pages_helper.rb in activeadmin-selleo-cms-0.0.20

@@ -1,30 +1,34 @@
 module PagesHelper
   def link_to_locale(link_name, locale, page=nil)
     if page
-      link_to link_name, page_path(locale.code, page.translated_attribute(:slug, locale.code))
+      link_to link_name, url_to_page(page, locale.to_s)
     elsif request.fullpath.match(/^\/\w{2}\/.*/)
       link_to link_name, request.fullpath.gsub(/^\/(\w{2})\//, "/#{locale.code}/")
     else
       link_to link_name, "/#{locale.code}"
     end
   end
 
   def link_to_search_result(result)
     if result.is_a? ActiveadminSelleoCms::Page
-      link_to result, result.url
+      "#{link_to result.breadcrumb, result.url} #{link_to "(e)", edit_admin_page_path(result.id), target: '_blank' if current_user}".html_safe
     end
   end
 
-  def url_to_page(page)
+  def url_to_page(page, locale=I18n.locale)
     return "#" unless page
-    if page.is_link_url
+    _locale = I18n.locale
+    I18n.locale = locale
+    _url = if page.is_link_url
       page.link_url
     elsif page.redirect_to_first_sub_page
       page.children.published.any? ? url_to_page(page.children.published.first) : "#"
     else
-      page_path(I18n.locale, page)
+      page_path(locale, page)
     end
+    I18n.locale = _locale
+    return _url
   end
 
   def link_to_page(page, link_name=nil)
     link_to (link_name || page.title), url_to_page(page)
   end