diff options
| author | Peter Kozak <spag@golwen.net> | 2013-06-27 08:56:03 +0200 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-06-27 08:56:03 +0200 |
| commit | 39c06e5b4fd5a984c4f93fa48567c63848632ced (patch) | |
| tree | 393ec0dbe1020d6800c94476f6c331d211ab9c30 /app/views | |
| parent | 677e234c6b3bbec189f2caf2f237f609ab44b274 (diff) | |
| parent | 1c6646bc732def369e54ef4ac576d748c6ba9c92 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/switchboards/show.html.erb | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/app/views/switchboards/show.html.erb b/app/views/switchboards/show.html.erb index 1a8e5a0..b390ce5 100644 --- a/app/views/switchboards/show.html.erb +++ b/app/views/switchboards/show.html.erb @@ -40,21 +40,32 @@ </p> {{/if}} - <p> - {{#each phoneNumber in switchboardEntry.sipAccount.phoneNumberShortList}} - <span class="label"> - {{phoneNumber.number}} - </span> + {{#if switchboardEntry.switchable}} + <p> + {{#each phoneNumber in switchboardEntry.sipAccount.phoneNumberShortList}} + <span class="label"> + {{phoneNumber.number}} + </span> + {{/each}} + </p> + {{else}} + <p> + {{#each phoneNumber in switchboardEntry.sipAccount.phoneNumberShortList}} + <span class="label"> + {{phoneNumber.number}} + </span> - {{#if activeCalls.length}} - <p> - {{#each activeCall in activeCalls}} - <button {{action transfer_blind activeCall.id phoneNumber.number}} class="btn btn-small">Transfer</button> - {{/each}} - </p> - {{/if}} - {{/each}} - </p> + {{#if dispatchableIncomingCalls.length}} + <p> + {{#each dispatchableIncomingCall in dispatchableIncomingCalls}} + <button {{action transfer_blind dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Transfer</button> + <button {{action transfer_attended dispatchableIncomingCall.id phoneNumber.number}} class="btn btn-small">Attended Transfer</button> + {{/each}} + </p> + {{/if}} + {{/each}} + </p> + {{/if}} {{#if switchboardEntry.sipAccount.calls.length}} <p> |