pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] event_sale_product_configurator: remove files brought back by conflict

Browse Source
This commit is contained in:
Victor Feyens
2019-06-07 11:33:42 +00:00
parent 1f0721acf0
commit 9cfe599973
2 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event_sale_product_configurator/static/tests/tours/event_configurator_ui.js
-27
View File
@@ -1,27 +0,0 @@
odoo.define("event_sale_product_configurator.event_configurator_tour", function (require) {
"use strict";
/**
* We need to replace the trigger of the product selection step because the
* "sale_product_configurator" module replaces the "product_id" field with
* a "product_template_id" field.
*/
var tour = require('web_tour.tour');
require('event.event_configurator_tour');
var productSelectionStepIndex = _.findIndex(tour.tours.event_configurator_tour.steps, function (step) {
return (step.id === 'product_selection_step');
});
var productSelectionStep = tour.tours.event_configurator_tour.steps[productSelectionStepIndex];
productSelectionStep.trigger = 'div[name="product_template_id"] input';
productSelectionStep.run = function (){
var $input = $('div[name="product_template_id"] input');
$input.click();
$input.val('EVENT');
// fake keydown to trigger search
var keyDownEvent = jQuery.Event("keydown");
keyDownEvent.which = 42;
$input.trigger(keyDownEvent);
};
});
addons/event_sale_product_configurator/views/assets.xml
-14
View File
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="assets_backend" inherit_id="web.assets_backend" name="event_sale_product_configurator assets backend">
<xpath expr="script[last()]" position="after">
<script type="text/javascript" src="/event_sale_product_configurator/static/src/js/product_configurator_widget.js"></script>
</xpath>
</template>
<template id="assets_tests" name="Event Sale Product Configurator Assets Tests" inherit_id="web.assets_tests">
<xpath expr="." position="inside">
<script type="text/javascript" src="/event_sale_product_configurator/static/tests/tours/event_configurator_ui.js"></script>
</xpath>
</template>
</odoo>