composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4664 - Core Update : block zip file upload until instance declared OK

Browse Source
This commit is contained in:
Molkobain
2022-03-09 18:21:08 +01:00
parent 70074ee1cb
commit 93a138606f
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
View File

@@ -11,6 +11,9 @@
<div>
<span id="can-core-update">{{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }} <i class="ajax-spin fas fa-spinner fa-spin" aria-hidden="true"></i></span>
</div>
<div id="header-requirements-details" style="display: none;">
<div id="can-core-update-details" style="background-color: white; padding: 8px; border-radius: 5px; margin-top: 8px;"></div>
</div>
</div>
<table style="vertical-align:top" class="one-col-details" data-mode="view">
@@ -74,7 +77,8 @@
</div>
</div>
<div class="field_container field_large">
<div id="check-in-progress" class="header_message message_info">{{ 'iTopUpdate:UI:CheckInProgress'|dict_s }}</div>
<div id="file-container" class="field_container field_large" style="display: none;">
<div class="field_data">
<div class="upload_container">
<input type="file" id="file" name="file"/>

8
datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig
View File

@@ -15,10 +15,18 @@ $.ajax({
var oRequirements = $("#header-requirements");
var oCanCoreUpdate = $("#can-core-update");
oCanCoreUpdate.html(data.sMessage);
if(data.sMessageDetails){
$("#header-requirements-details").show();
$('#can-core-update-details').html(data.sMessageDetails);
}
oRequirements.removeClass("message_info");
if (data.bStatus)
{
oRequirements.addClass("message_ok");
$("#check-update").prop("disabled", false);
$("#file").prop("disabled", false);
$("#file-container").show();
$("#check-in-progress").hide();
}
else
{