app/helpers/crud_helper.rb in templus_models-1.4.4 vs app/helpers/crud_helper.rb in templus_models-1.5.0

@@ -58,15 +58,16 @@
   def is_action_query?
     params[:action] == "query"
   end
   
   
-  def render_link(link)
+  def render_link(link,url)
     if link[:partial].present?
       render link[:partial]
+    elsif link[:link]
+      link_to "#{gen_icon(link[:icon])} #{link[:text]}".html_safe, "#{url}/#{link[:link]}", class: link[:class], data: data(link)
     else
-      url = link[:url] || link[:link]
-      link_to "#{gen_icon(link[:icon])} #{link[:text]}".html_safe, url, class: link[:class], data: data(link)
+      link_to "#{gen_icon(link[:icon])} #{link[:text]}".html_safe, link[:url], class: link[:class], data: data(link)
     end
   end
 
   def gen_icon(i)
     if i
\ No newline at end of file