diff options
| author | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-02-13 05:39:43 -0600 |
|---|---|---|
| committer | Mario "Kuroir" Ricalde <kuroir@gmail.com> | 2013-02-13 05:39:43 -0600 |
| commit | c2aad881ff34ce544b24847279472448917f38e1 (patch) | |
| tree | 4b42aa65165f9adcc8e113a20cd141866cb09758 /app/views | |
| parent | 791bf973b02b626f876b7e5819e2037dcff90f84 (diff) | |
| parent | 1776a5b243aa7b62eff09319e2f766426307e220 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/config_snom/show.xml.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml index 33204dc..1102ad1 100644 --- a/app/views/config_snom/show.xml.haml +++ b/app/views/config_snom/show.xml.haml @@ -176,7 +176,9 @@ %action - softkey[:actions].each do |action| - if action[:type] == :url - %url{:target => action[:target], :when => action[:when]} + %url{:target => action[:target], :when => action[:when], :states => action[:states]} + - elsif action[:type] == :dial + %dial{:target => action[:target], :when => action[:when], :states => action[:states], :request_uri => '$(remote_uri)'} %uploads - if @state_settings_url |