Browse Source

[FIX] base_phone: Fixed click2dial feature

pull/109/head
Sylvain GARANCHER 8 years ago
committed by Alexis de Lattre
parent
commit
ca19bd459a
  1. 6
      asterisk_click2dial/static/src/xml/asterisk_click2dial.xml
  2. 12
      base_phone/controllers/main.py
  3. 4
      base_phone/static/src/js/phone_widget.js
  4. 18
      base_phone/static/src/xml/phone.xml

6
asterisk_click2dial/static/src/xml/asterisk_click2dial.xml

@ -15,12 +15,10 @@
</t>
<!-- Add Dial button in phone widget for click2dial feature -->
<!--
<t t-extend="FieldPhone">
<t t-jquery="a.oe_form_uri" t-operation="after">
<a id="click2dial" href="#" class="oe_bold"/>
<t t-jquery="a.o_form_uri" t-operation="after">
<a t-if="widget.clickable" id="click2dial" href="#" class="oe_bold"/>
</t>
</t>
-->
</template>

12
base_phone/controllers/main.py

@ -19,15 +19,15 @@
#
##############################################################################
import odoo
from odoo import http
class BasePhoneController(odoo.http.Controller):
@odoo.http.route('/base_phone', type='json', auth='none')
def click2dial(self, req, phone_number, click2dial_model, click2dial_id):
res = req.session.model('phone.common').click2dial(
class BasePhoneController(http.Controller):
@http.route('/base_phone/click2dial', type='json', auth='none')
def click2dial(self, phone_number, click2dial_model, click2dial_id):
res = http.request.env['phone.common'].click2dial(
phone_number, {
'click2dial_model': click2dial_model,
'click2dial_id': click2dial_id,
})
})
return res

4
base_phone/static/src/js/phone_widget.js

@ -49,9 +49,9 @@ odoo.define('base_phone.phone_widget', function (require) {
if (phone_num && !this.options.dial_button_invisible) {
click2dial_text = _t('Dial');
}
this.$el.find('#click2dial').off('click');
this.$el.find('#click2dial')
this.$el.filter('#click2dial')
.text(click2dial_text)
.attr('href', '#')
.on('click', function(ev) {
self.do_notify(
_t('Click2dial started'),

18
base_phone/static/src/xml/phone.xml

@ -7,12 +7,22 @@
<templates id="template" xml:space="preserve">
<t t-name="FieldFax">
<t t-call="FieldEmail"/>
<t t-name="FieldFax" t-extend="FieldEmail">
<t t-jquery="span" t-operation="replace">
<t t-if="widget.get('effective_readonly')">
<a t-if="widget.clickable" class="o_form_uri o_text_overflow" href="#" target="_blank"/>
<span t-if="!widget.clickable" class="o_text_overflow"/>
</t>
</t>
</t>
<t t-name="FieldPhone">
<t t-call="FieldFax"/>
<t t-name="FieldPhone" t-extend="FieldFax">
<t t-jquery="span" t-operation="replace">
<t t-if="widget.get('effective_readonly')">
<a t-if="widget.clickable" class="o_form_uri o_text_overflow" href="#" target="_blank"/>
<span t-if="!widget.clickable" class="o_text_overflow"/>
</t>
</t>
</t>
</templates>
Loading…
Cancel
Save