summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-19 09:05:50 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-19 09:05:50 +0100
commitb4abd87252db53e3d79a9601cf9c581f61827f10 (patch)
tree6d26fff9ec773589707c390bf0453999e0e4d4d1 /app
parenta4c2b5b00c074d8861ef313f672032611d662fff (diff)
Added call_routes to tenant#show
Diffstat (limited to 'app')
-rw-r--r--app/models/route_element.rb2
-rw-r--r--app/views/tenants/_admin_area.de.html.haml4
-rw-r--r--app/views/tenants/_call_routes.html.haml8
3 files changed, 12 insertions, 2 deletions
diff --git a/app/models/route_element.rb b/app/models/route_element.rb
index 87b26ef..324a26d 100644
--- a/app/models/route_element.rb
+++ b/app/models/route_element.rb
@@ -13,7 +13,7 @@ class RouteElement < ActiveRecord::Base
def to_s
- "#{var_in} #{var_out}"
+ "#{pattern} => #{var_in} #{var_out}"
end
end
diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml
index fed7d4f..ba64e9a 100644
--- a/app/views/tenants/_admin_area.de.html.haml
+++ b/app/views/tenants/_admin_area.de.html.haml
@@ -25,4 +25,6 @@
=link_to manufacturer, manufacturer_path(manufacturer)
- else
= succeed '.' do
- =link_to manufacturer, manufacturer_path(manufacturer) \ No newline at end of file
+ =link_to manufacturer, manufacturer_path(manufacturer)
+
+= render :partial => 'call_routes', :locals => {:tenant => @tenant} \ No newline at end of file
diff --git a/app/views/tenants/_call_routes.html.haml b/app/views/tenants/_call_routes.html.haml
new file mode 100644
index 0000000..ade24c9
--- /dev/null
+++ b/app/views/tenants/_call_routes.html.haml
@@ -0,0 +1,8 @@
+%h2= t("call_routes.index.page_title")
+
+- if CallRoute.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS')
+ = render "call_routes/index_core", :call_routes => CallRoute.call
+ = render :partial => 'shared/create_link', :locals => {:child_class => CallRoute}
+- else
+ %p
+ = link_to t("call_routes.index.page_title"), call_routes_path \ No newline at end of file