composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 08:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Customer portal : Readonly attachments when object is not longer editable

Browse Source 
SVN:trunk[4250]
This commit is contained in:
Guillaume Lajarige
2016-06-23 07:54:00 +00:00
parent 29cd969d49
commit eabc2a4eab
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -599,7 +599,7 @@ class ObjectFormManager extends FormManager
break;
}
}
// Adding attachment field
if ($bClassAllowed)
{
@@ -611,7 +611,7 @@ class ObjectFormManager extends FormManager
->SetAllowDelete($this->oApp['combodo.portal.instance.conf']['properties']['attachments']['allow_delete'])
->SetObject($this->oObject);
if ($this->sMode === static::ENUM_MODE_VIEW)
if (($this->sMode === static::ENUM_MODE_VIEW) || ($oForm->GetEditableFieldCount() === 0))
{
$oField->SetReadOnly(true);
}

10
datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_create.html.twig
View File

@@ -72,8 +72,14 @@
var oNormalRegularButtons_{{ sFormIdSanitized }} = $('#{{ sFormId }} .form_btn_regular');
var oStickyRegularButtons_{{ sFormIdSanitized }} = oNormalRegularButtons_{{ sFormIdSanitized }}.clone(true, true);
oStickyRegularButtons_{{ sFormIdSanitized }}.addClass('sticky');
oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_submit').html( oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_submit span.glyphicon')[0].outerHTML );
oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_cancel').html( oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_cancel span.glyphicon')[0].outerHTML );
if(oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_submit span.glyphicon').length > 0)
{
oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_submit').html( oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_submit span.glyphicon')[0].outerHTML );
}
if(oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_cancel span.glyphicon').length > 0)
{
oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_cancel').html( oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_cancel span.glyphicon')[0].outerHTML );
}
$('#{{ sFormId }}').closest({% if tIsModal == true %}'.modal'{% else %}'#main-content'{% endif %}).append(oStickyRegularButtons_{{ sFormIdSanitized }});

2
sources/renderer/bootstrap/fieldrenderer/bsfileuploadfieldrenderer.class.inc.php
View File

@@ -48,7 +48,7 @@ class BsFileUploadFieldRenderer extends FieldRenderer
$oOutput = new RenderingOutput();
$sObjectClass = get_class($this->oField->GetObject());
$sIsDeleteAllowed = ($this->oField->GetAllowDelete()) ? 'true' : 'false';
$sIsDeleteAllowed = ($this->oField->GetAllowDelete() && !$this->oField->GetReadOnly()) ? 'true' : 'false';
$sDeleteBtn = Dict::S('Portal:Button:Delete');
$sTempId = session_id() . '_' . $this->oField->GetTransactionId();
$sUploadDropZoneLabel = Dict::S('Portal:Attachments:DropZone:Message');