Commit a3ae1a28 authored by Alexandre Goldstein's avatar Alexandre Goldstein
Browse files

Merge branch 'fix/12603_paramIE11' into 'release/2.5.2'

hotfix_12603_bugIE11_DefaultParam

See merge request !373
parents da71688d 4b13d91d
Pipeline #5645 passed with stage
in 7 minutes and 21 seconds
......@@ -337,7 +337,12 @@
retentionRuleText = retentionRuleText.replace(/%2\$s/g, numeric+' '+unit);
$('#retentionRuleText').text(retentionRuleText);
},
syncSerialize : function(action = "add") {
syncSerialize : function(action) {
// to inititate default value and avoid bug on IE 11
if (action === undefined)
{
action = "add";
}
var form = $('#archiveForm, #managementMetadataForm');
var inputs = form.find('.archiveInput');
var archive = {
......
......@@ -321,7 +321,7 @@
},
editMetadata: function() {
var archiveInformation=$('#archiveInformation');
var archiveInformation = $('#archiveInformation');
$('#editMetadata').prop('disabled',true);
$('#saveMetadata').show();
$('#cancelMetadataEdition').show();
......
......@@ -277,7 +277,7 @@
})
},
checkRights: function (archivalProfiles, withoutProfile, fileplanLevel){
checkRights: function (archivalProfiles, withoutProfile, fileplanLevel) {
var button = this.selected.closest('.archive').find('.addChildrenArchive');
var archiveStatus = button.closest('.archive').find('.status').text();
if (archiveStatus == 'disposed' || fileplanLevel == 'item' || (!archivalProfiles.length && withoutProfile !== 1)) {
......
......@@ -781,7 +781,14 @@ input:invalid {
itemList.append(previous);
},
addCustomField : function(source = "", target = $("#customFields")) {
addCustomField : function(source, target) {
// to inititate default value and avoid bug on IE 11
if (source === undefined) {
source = "";
}
if (target === undefined) {
target = $("#customFields");
}
var formGroup = $('<div class="form-group" />');
var label = $('<div class="col-md-3"/>');
var name = $('<input type="text" class="form-control input-sm name" />');
......
......@@ -255,7 +255,15 @@
$("#folderToolbarSearch").data("orgregnumber", orgRegNumber).data("folderid", folderId);
},
buildResultList: function(archives, options = null, showArchivePath = false) {
buildResultList: function(archives, options, showArchivePath) {
// to inititate default value and avoid bug on IE 11
if (options === undefined) {
options = null;
}
if (showArchivePath === undefined) {
showArchivePath = false;
}
trigger("clearDetail.recordsManagement");
this.showArchivePath = showArchivePath;
......
......@@ -55,7 +55,21 @@
var SearchTab = {
run : function (orgRegNumber = null, folderId = null, title = null, profiles = null) {
run : function (orgRegNumber, folderId, titre, profiles) {
// to inititate default value and avoid bug on IE 11
if (orgRegNumber === undefined) {
orgRegNumber = null;
}
if (folderId = undefined) {
folderId = null;
}
if (title = undefined) {
title = null;
}
if (profiles = undefined) {
profiles = null;
}
var uniqId = new Date().getUTCMilliseconds();
this.tabCreation(uniqId, title);
......
......@@ -208,7 +208,11 @@
return userAccesses
},
removeFromList: function(li, removeFromSelect = true) {
removeFromList: function(li, removeFromSelect) {
// to inititate default value and avoid bug on IE 11
if (removeFromSelect === undefined) {
removeFromSelect = true;
}
if (removeFromSelect) {
$('#profileReference').val('').find('option[value="'+li.data('json').archivalProfileReference+'"]').removeClass('hide');
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment