10.2.dev30 formulaire ouvert mauvais message

This commit is contained in:
Fred Tempez 2020-06-06 11:55:56 +02:00
parent 6b2c44c3fc
commit 0ac70c9f51
2 changed files with 5 additions and 4 deletions

View File

@ -260,10 +260,10 @@ core.start = function() {
var fileName = inputFileHiddenDOM.val(); var fileName = inputFileHiddenDOM.val();
if(fileName === "") { if(fileName === "") {
fileName = "Choisissez un fichier"; fileName = "Choisissez un fichier";
$(".inputFileDelete").addClass("disabled"); $(inputFileHiddenDOM).addClass("disabled");
} }
else { else {
$(".inputFileDelete").removeClass("disabled"); $(inputFileHiddenDOM).removeClass("disabled");
} }
inputFileHiddenDOM.parent().find(".inputFileLabel").text(fileName); inputFileHiddenDOM.parent().find(".inputFileLabel").text(fileName);
}).trigger("change"); }).trigger("change");

View File

@ -39,7 +39,7 @@ class common {
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.2.00.dev28'; const ZWII_VERSION = '10.2.00.dev30';
const ZWII_UPDATE_CHANNEL = "v10"; const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = []; public static $actions = [];
@ -1668,7 +1668,8 @@ class core extends common {
*/ */
foreach($this->getData(['user']) as $userId => $userIds){ foreach($this->getData(['user']) as $userId => $userIds){
$t = explode('/',$this->getData(['user', $userId, 'accessUrl'])); $t = explode('/',$this->getData(['user', $userId, 'accessUrl']));
if ( $userId !== $this->getuser('id') && if ( $this->getuser('id') &&
$userId !== $this->getuser('id') &&
$this->getData(['user', $userId,'accessUrl']) === $this->getUrl() && $this->getData(['user', $userId,'accessUrl']) === $this->getUrl() &&
array_intersect($t,self::$accessList) && array_intersect($t,self::$accessList) &&
array_intersect($t,self::$accessExclude) !== false && array_intersect($t,self::$accessExclude) !== false &&