Commit c61cb668 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b24'

parents 0efc47b4 712f2d37

data/formules/FORMULE_LYON3.ods

+45.8 KiB (288 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

module/Formule/src/Service/TraducteurService.php

+5 −0
Original line number Diff line number Diff line
@@ -610,6 +610,11 @@ class TraducteurService 
                }

            }

        }



        /* On supprime les parenthèses inutiles */

        if (isset($expr[$i]['type']) && $expr[$i]['type'] == 'expr' && count($expr) == 1){

            $expr = $expr[$i]['expr'];

        }

    }

public/js/mod-ajax.js

+4 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ $.widget("unicaen.modAjax", { 
        this.setTitle(this.options.loadingTitle);

        this.setContent(this.options.loadingContent, true);

        $.ajax({

            url: this.options.url,

            url: that.options.url,

            success: (response) => {

                that.setContent(response);
@@ -374,7 +374,9 @@ function modAjax(element, onSubmit) 
        widget.show();

    }

    widget.element = $(element);

    if (element.dataset.url) {

        widget.options.url = element.dataset.url;

    }



    return widget;

}
 
 No newline at end of file