[FIX] drop when no dropzone, [IMP] Jobs layout
bzr revid: fp@openerp.com-20131116085350-gfrm0jn7bv3ubfz7
This commit is contained in:
parent
9ff7418804
commit
46a967502d
|
@ -47,16 +47,16 @@ class view(osv.osv):
|
|||
if options:
|
||||
todo += filter(lambda x: not x.inherit_id, view.inherited_option_ids)
|
||||
for child_view in todo:
|
||||
result += self._views_get(cr, uid, child_view, options=options, context=context, root=False, stack_result=result)
|
||||
for r in self._views_get(cr, uid, child_view, options=options, context=context, root=False, stack_result=result):
|
||||
if r not in result:
|
||||
result.append(r)
|
||||
node = etree.fromstring(view.arch)
|
||||
for child in node.xpath("//t[@t-call]"):
|
||||
call_view = view_obj(child.get('t-call'))
|
||||
if call_view not in stack_result:
|
||||
if call_view not in result:
|
||||
result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result)
|
||||
return result
|
||||
|
||||
|
||||
|
||||
def extract_embedded_fields(self, cr, uid, arch, context=None):
|
||||
return arch.xpath('//*[@data-oe-model != "ir.ui.view"]')
|
||||
|
||||
|
|
|
@ -336,10 +336,10 @@
|
|||
});
|
||||
},
|
||||
stop: function(ev, ui){
|
||||
if (action === 'insert' && ! dropped) {
|
||||
var $el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
|
||||
if ($el) {
|
||||
$el.after($toInsert);
|
||||
if (action === 'insert' && ! dropped && $('.oe_drop_zone')) {
|
||||
var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
|
||||
if (el.length) {
|
||||
el.after($toInsert);
|
||||
dropped = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -130,10 +130,9 @@
|
|||
<i class="icon-time"/> <span><t t-esc="vals_date"/></span>
|
||||
</h5>
|
||||
</div>
|
||||
<div class="container oe_structure">
|
||||
<div class="row">
|
||||
<div t-if="job.website_description">
|
||||
<div t-field="job.website_description"/>
|
||||
|
||||
<div class="oe_structure">
|
||||
<section data-snippet-id="cta" class="mt16 mb16">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
|
@ -145,8 +144,6 @@
|
|||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
</template>
|
||||
|
||||
|
|
Loading…
Reference in New Issue