Commit 33bdf593 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- FIX : Bug dans l'importation des calendriers (l'import du fichier ne fonctionnait plus)

parent 2ce07040

module/Oscar/view/oscar/timesheet/import-ical.phtml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
    <div id="app"></div>



    <script>

        require(['vue', 'vue-resource', 'mm', 'ical', 'ImportIcalUI'], function(Vue, VueResource, moment, ICAL, ImportIcalUI) {

        require(['vue', 'vue-resource', 'mm', 'moment-tz', 'ical', 'ImportIcalUI'], function(Vue, VueResource, moment, mmtz, ICAL, ImportIcalUI) {



            Vue.use(VueResource);

public/js/oscar-config.js

+7 −1
Original line number Diff line number Diff line
@@ -19,8 +19,13 @@ requirejs.config({ 
        "jqueryui-core": "vendor/jqueryui/ui/core",

        "jqueryui-widget": "vendor/jqueryui/ui/widget",

        "jquery-serialize": "vendor/jquery-serialize-object/dist/jquery.serialize-object.min",



        /** OLD **

        "moment": "vendor/momentjs/min/moment-with-locales.min",

        /*********/

        "moment": "vendor/momentjs/min/moment-with-locales.min",

        "moment-tz": "vendor/moment-timezone/builds/moment-timezone-with-data.min",



        "moment-timezone": "vendor/moment-timezone/builds/moment-timezone-with-data",

        "underscore": "vendor/underscore/underscore-min",

        "bt-datepicker": "vendor/bootstrap-datepicker/dist/js/bootstrap-datepicker.min",
@@ -179,7 +184,7 @@ requirejs.config({ 
            deps: ["ical", "moment-timezone"]

        },

        "moment-timezone": {

//            exports: "tz",

            exports: "tz",

            deps: ["moment"]

        },

        "EventDT": {
@@ -204,6 +209,7 @@ define("datepicker", ["jquery", "bootstrap", "bt-datepicker"], function ($) { 
});



define("mm", ["moment"], function (moment) {

    console.log("Moment with timezone");

    moment.locale("fr");

    return moment;

});

public/js/oscar/dist/ImportIcalUI.js.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.