composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 06:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue/7746' into develop

Browse Source
This commit is contained in:
XGUI
2024-11-29 08:24:27 +01:00
parent af8ff9b29f 642a13ad0d
commit 6490fe93a1
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
View File

@@ -1150,12 +1150,13 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
}
}
.form_field .form_mandatory .control-label:after{
content: "\002a";
content: "\1F6C8";
position: relative;
left: 3px;
color: $brand-primary;
font-size: 0.9em;
}
font-weight: 200;
};
/* Note: We don't put the .form_field selector as it must work for read-only */
.form-control-static img{
max-width: 100% !important;

18
datamodels/2.x/itop-structure/datamodel.itop-structure.xml
View File

@@ -2043,4 +2043,22 @@
</profiles>
</user_rights>
<constants/>
<snippets>
<snippet id="GestionCssInfo" _delta="define">
<placement>module</placement>
<module>itop-structure</module>
<rank>-1</rank>
<content>
<![CDATA[
class GestionCssInfo implements iBackofficeStyleExtension
{
public function GetStyle(): string
{
return '.ibo-field--label>.ibo-has-description::after, .ibo-input-with-label--label.ibo-has-description::after{content:"\1F6C8"; font-weight: 200;} ';
}
}
]]>
</content>
</snippet>
</snippets>
</itop_design>

11
sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
View File

@@ -763,7 +763,7 @@ class ActivityPanel extends UIBlock
*/
public function IsComposeButtonEnabled(): bool
{
return $this->HasAnEditableCaseLogTab() && $this->IsCaseLogsSubmitAutonomous();
return $this->HasAnEditableCaseLogTab() && $this->IsCaseLogsSubmitAutonomous() && $this->HasUserModifyRights();
}
/**
@@ -974,4 +974,13 @@ class ActivityPanel extends UIBlock
$this->bShowMultipleEntriesSubmitConfirmation = appUserPreferences::GetPref('activity_panel.show_multiple_entries_submit_confirmation', static::DEFAULT_SHOW_MULTIPLE_ENTRIES_SUBMI_CONFIRMATION) !== 'false';
return $this;
}
/**
* @return bool
* @throws \CoreException
*/
protected function HasUserModifyRights(): bool
{
return \UserRights::IsActionAllowed($this->GetObjectClass(), UR_ACTION_MODIFY);
}
}