Compare commits

..

4 Commits

Author SHA1 Message Date
xavier.guiboud-ribaud@combodo.com
8103f4c92c 7746 - Caselog edition button active even if the user has a read-only access to the object
Remove unwanted modifications pushed on the wrong branch
2024-11-26 13:54:19 +01:00
xavier.guiboud-ribaud@combodo.com
d6f3ee9758 7746 - Caselog edition button active even if the user has a read-only access to the object
Coding conventions compliance
2024-11-26 10:17:52 +01:00
xavier.guiboud-ribaud@combodo.com
808168b9e7 N°7984 - Change ? for field description (tooltip) by 🛈 in console and portal 2024-11-26 08:05:52 +01:00
xavier.guiboud-ribaud@combodo.com
120eb702a7 7746 - Caselog edition button active even if the user has a read-only access to the object 2024-11-25 16:01:39 +01:00
3 changed files with 13 additions and 5 deletions

View File

@@ -4,7 +4,7 @@
*/
/* SCSS variables */
$common-has-description--content: "" !default;
$common-has-description--content: "?" !default;
$common-has-description--padding-left: $common-spacing-200 !default;
$common-has-description--color: $common-color-grey-600 !default;
$common-has-description--font-size: 0.7em !default; /* Font size is em on purpose as we want it to be proportional to its context */

View File

@@ -1140,14 +1140,13 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
.form_field_label > .control-label[data-tooltip-instantiated="true"] {
&::after {
content: "";
content: "?";
padding-left: 3px;
vertical-align: top;
cursor: pointer;
color: $gray;
font-size: 0.85em;
font-weight: 200;
}
}
.form_field .form_mandatory .control-label:after{
@@ -1156,7 +1155,7 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
left: 3px;
color: $brand-primary;
font-size: 0.9em;
}
};
/* Note: We don't put the .form_field selector as it must work for read-only */
.form-control-static img{
max-width: 100% !important;

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);
}
}