From edb3c4d6eeb603a84403bf81e695330a8ea9c603 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 08:37:14 +0100 Subject: Bugfix --- config/initializers/update_gs_version_number.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/initializers/update_gs_version_number.rb b/config/initializers/update_gs_version_number.rb index 972c480..4770858 100644 --- a/config/initializers/update_gs_version_number.rb +++ b/config/initializers/update_gs_version_number.rb @@ -2,7 +2,8 @@ # It equals the branch in git. # if !ENV['GS_VERSION'].nil? && GsParameter.table_exists? && GsParameter.get('GEMEINSCHAFT_VERSION') != ENV['GS_VERSION'] - if GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').any? - GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').first.update_attributes(:name => ENV['GS_VERSION']) - end + version = GsParameter.find_or_create_by_name('GEMEINSCHAFT_VERSION') + version.section = 'Generic' + version.value = ENV['GS_VERSION'] + version.save end -- cgit v1.2.3 From 68df952403f7ce468c1e7f928171d880cd59ede0 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 08:39:34 +0100 Subject: Added public/gemeinschaft_setups/ to .gitignore. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 65a18ad..4d70e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,6 @@ tmp/**/* # Freeswitch /misc/freeswitch/conf/freeswitch.serial /misc/freeswitch/scripts/ini/gateway_gateway1.ini + +# Cache +/public/gemeinschaft_setups/* -- cgit v1.2.3 From a4c2b5b00c074d8861ef313f672032611d662fff Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 08:53:02 +0100 Subject: Refactoring. --- app/views/tenants/_admin_area.de.html.haml | 15 ++------------- app/views/tenants/_admin_area.html.haml | 15 ++------------- app/views/tenants/_table_of_phone_books.html.haml | 1 + app/views/tenants/_user_groups_table.de.html.haml | 4 ++++ app/views/tenants/_users_table.de.html.haml | 7 +++++++ 5 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 app/views/tenants/_user_groups_table.de.html.haml create mode 100644 app/views/tenants/_users_table.de.html.haml diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml index 268c8e7..fed7d4f 100644 --- a/app/views/tenants/_admin_area.de.html.haml +++ b/app/views/tenants/_admin_area.de.html.haml @@ -1,23 +1,12 @@ -%h2 Admin Bereich = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} -%h2= t("users.index.page_title") -- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "users/index_core", :users => @tenant.users - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => User} -- else - %p - = link_to "Liste aller User.", tenant_users_path(@tenant) += render :partial => 'users_table', :locals => {:tenant => @tenant} -- if @tenant.user_groups.any? - %h2= t("user_groups.index.page_title") - = render "user_groups/index_core", :user_groups => @tenant.user_groups - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => UserGroup} += render :partial => 'user_groups_table', :locals => {:tenant => @tenant} %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} -%h2=t("phone_books.index.page_title") = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} %h2 Gemeinschaft Konfiguration diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml index e708215..50ed372 100644 --- a/app/views/tenants/_admin_area.html.haml +++ b/app/views/tenants/_admin_area.html.haml @@ -1,23 +1,12 @@ -%h2 Admin Area = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant} -%h2= t("users.index.page_title") -- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') - = render "users/index_core", :users => @tenant.users - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => User} -- else - %p - = link_to "Liste aller User.", tenant_users_path(@tenant) += render :partial => 'users_table', :locals => {:tenant => @tenant} -- if @tenant.user_groups.any? - %h2= t("user_groups.index.page_title") - = render "user_groups/index_core", :user_groups => @tenant.user_groups - = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => UserGroup} += render :partial => 'user_groups_table', :locals => {:tenant => @tenant} %h2 Features = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant} -%h2=t("phone_books.index.page_title") = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant} %h2 Gemeinschaft Configuration diff --git a/app/views/tenants/_table_of_phone_books.html.haml b/app/views/tenants/_table_of_phone_books.html.haml index 6baca58..9d9b97c 100644 --- a/app/views/tenants/_table_of_phone_books.html.haml +++ b/app/views/tenants/_table_of_phone_books.html.haml @@ -1,4 +1,5 @@ - cache(['user_show_phone_books', I18n.locale, tenant, tenant.phone_books]) do + %h2=t("phone_books.index.page_title") -# Phone books -# - if GuiFunction.display?('show_phone_books_in_user_show_view', current_user) diff --git a/app/views/tenants/_user_groups_table.de.html.haml b/app/views/tenants/_user_groups_table.de.html.haml new file mode 100644 index 0000000..61b3e3d --- /dev/null +++ b/app/views/tenants/_user_groups_table.de.html.haml @@ -0,0 +1,4 @@ +- if @tenant.user_groups.any? + %h2= t("user_groups.index.page_title") + = render "user_groups/index_core", :user_groups => tenant.user_groups + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => UserGroup} diff --git a/app/views/tenants/_users_table.de.html.haml b/app/views/tenants/_users_table.de.html.haml new file mode 100644 index 0000000..850ea5e --- /dev/null +++ b/app/views/tenants/_users_table.de.html.haml @@ -0,0 +1,7 @@ +%h2= t("users.index.page_title") +- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS') + = render "users/index_core", :users => tenant.users + = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => User} +- else + %p + = link_to "Liste aller User.", tenant_users_path(tenant) \ No newline at end of file -- cgit v1.2.3 From b4abd87252db53e3d79a9601cf9c581f61827f10 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 09:05:50 +0100 Subject: Added call_routes to tenant#show --- app/models/route_element.rb | 2 +- app/views/tenants/_admin_area.de.html.haml | 4 +++- app/views/tenants/_call_routes.html.haml | 8 ++++++++ config/locales/views/call_routes/de.yml | 28 ++++++++++++++-------------- 4 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 app/views/tenants/_call_routes.html.haml 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 diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml index 34af575..71ad51a 100644 --- a/config/locales/views/call_routes/de.yml +++ b/config/locales/views/call_routes/de.yml @@ -1,27 +1,27 @@ de: call_routes: - name: 'Call route' + name: 'Call Route' controller: - successfuly_created: 'Call route wurde angelegt.' - successfuly_updated: 'Call route wurde aktualisiert.' - successfuly_destroyed: 'Call route wurde gelöscht.' + successfuly_created: 'Call Route wurde angelegt.' + successfuly_updated: 'Call Route wurde aktualisiert.' + successfuly_destroyed: 'Call Route wurde gelöscht.' index: - page_title: 'Übersicht von Call route' - table: 'Table' + page_title: 'Liste aller Call Routen' + routing_table: 'Routing Table' name: 'Name' endpoint_type: 'Endpoint type' endpoint_id: 'Endpoint' position: 'Position' actions: - confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call route' + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call Route' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' create: 'Neu anlegen' - create_for: 'Call route neu anlegen für %{resource}' + create_for: 'Call Route neu anlegen für %{resource}' show: - page_title: 'Call route bearbeiten' - table: 'Table' + page_title: 'Call Route bearbeiten' + routing_table: 'Routing Table' name: 'Name' endpoint_type: 'Endpoint type' endpoint_id: 'Endpoint' @@ -32,18 +32,18 @@ de: edit: 'Bearbeiten' view_all: 'Alle anzeigen' new: - page_title: 'Call route neu anlegen' + page_title: 'Call Route neu anlegen' actions: back_to_list: 'Zurück zur Übersicht' edit: - page_title: 'Call route bearbeiten' + page_title: 'Call Route bearbeiten' actions: back_to_list: 'Zurück zur Übersicht' edit: 'Bearbeiten' view_all: 'Alle anzeigen' form: - table: - label: 'Table' + routing_table: + label: 'Routing Table' hint: '' name: label: 'Name' -- cgit v1.2.3