From fc20c3bd87e473b5eeb841187e15615ca95b8b35 Mon Sep 17 00:00:00 2001 From: Daniel Tiefnig Date: Wed, 14 Oct 2009 01:07:33 +0000 Subject: [PATCH] renamed domain/rewrite to domain/detail --- lib/admin/Controller/domain.pm | 23 ++++++++++------------- root/tt/domain.tt | 2 +- root/tt/domain_rewrite.tt | 6 +++--- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/lib/admin/Controller/domain.pm b/lib/admin/Controller/domain.pm index fa830f7..098ff07 100644 --- a/lib/admin/Controller/domain.pm +++ b/lib/admin/Controller/domain.pm @@ -168,15 +168,15 @@ sub do_delete_domain : Local { return; } -=head2 rewrite +=head2 detail -Show rewrite rules for a given domain +Show details for a given domain: rewrite rules =cut -sub rewrite : Local { +sub detail : Local { my ( $self, $c ) = @_; - $c->stash->{template} = 'tt/domain_rewrite.tt'; + $c->stash->{template} = 'tt/domain_detail.tt'; my $domain = $c->request->params->{domain}; @@ -199,7 +199,6 @@ Create a rewrite rule for a given domain sub create_rewrite : Local { my ( $self, $c ) = @_; - $c->stash->{template} = 'tt/domain_rewrite.tt'; my %messages; my %settings; @@ -221,7 +220,7 @@ sub create_rewrite : Local { { $messages{icalleemsg} = 'Server.Voip.SavedSettings'; $c->session->{messages} = \%messages; - $c->response->redirect("/domain/rewrite?domain=$domain"); + $c->response->redirect("/domain/detail?domain=$domain"); return; } else @@ -232,7 +231,7 @@ sub create_rewrite : Local { } $c->session->{messages} = \%messages; - $c->response->redirect("/domain/rewrite?domain=$domain"); + $c->response->redirect("/domain/detail?domain=$domain"); return; } @@ -244,7 +243,6 @@ Updates a rewrite rule sub edit_rewrite : Local { my ( $self, $c ) = @_; - $c->stash->{template} = 'tt/domain_rewrite.tt'; my %messages; my %settings; @@ -267,7 +265,7 @@ sub edit_rewrite : Local { { $messages{icalleemsg} = 'Server.Voip.SavedSettings'; $c->session->{messages} = \%messages; - $c->response->redirect("/domain/rewrite?domain=$domain"); + $c->response->redirect("/domain/detail?domain=$domain"); return; } else @@ -278,7 +276,7 @@ sub edit_rewrite : Local { } $c->session->{messages} = \%messages; - $c->response->redirect("/domain/rewrite?domain=$domain"); + $c->response->redirect("/domain/detail?domain=$domain"); return; } @@ -290,7 +288,6 @@ Delete a rewrite rule sub delete_rewrite : Local { my ( $self, $c ) = @_; - $c->stash->{template} = 'tt/domain_rewrite.tt'; my %messages; my %settings; @@ -307,14 +304,14 @@ sub delete_rewrite : Local { { $messages{icalleemsg} = 'Server.Voip.SavedSettings'; $c->session->{messages} = \%messages; - $c->response->redirect("/domain/rewrite?domain=$domain"); + $c->response->redirect("/domain/detail?domain=$domain"); return; } } else { } $c->session->{messages} = \%messages; - $c->response->redirect("/domain/rewrite?domain=$domain"); + $c->response->redirect("/domain/detail?domain=$domain"); return; } diff --git a/root/tt/domain.tt b/root/tt/domain.tt index a046ca4..cb0b477 100644 --- a/root/tt/domain.tt +++ b/root/tt/domain.tt @@ -16,7 +16,7 @@ [% id = 0 %] [% FOREACH domain = domains %] - [% domain.domain %] + [% domain.domain %] [% IF domain.domain == edit_domain %]
diff --git a/root/tt/domain_rewrite.tt b/root/tt/domain_rewrite.tt index 0ea683b..fd10897 100644 --- a/root/tt/domain_rewrite.tt +++ b/root/tt/domain_rewrite.tt @@ -1,5 +1,5 @@

Domain Rewrite Rules for domain - + [% domain.domain %]

@@ -45,14 +45,14 @@
- cancel + cancel [% ELSE %] [% rule.match_pattern %] [% rule.replace_pattern %] [% rule.description %] [% UNLESS Catalyst.session.admin.read_only %] - edit + edit [% END %]