";
$activerand = mt_rand();
echo " | ";
- Dropdown::showYesNo('is_active', $this->fields['is_active'], -1, ['rand' => $activerand]);
+ $params = ['rand' => $activerand];
+ if (!$higherrights) {
+ $params['readonly'] = true;
+ $params['tooltip'] = __('Not enough rights to change this field');
+ }
+ Dropdown::showYesNo('is_active', $this->fields['is_active'], -1, $params);
echo " | ";
echo "" . _sn('Email', 'Emails', Session::getPluralNumber());
UserEmail::showAddEmailButton($this);
diff --git a/src/UserEmail.php b/src/UserEmail.php
index 929a1ed7bfe..1e927d3041d 100644
--- a/src/UserEmail.php
+++ b/src/UserEmail.php
@@ -255,7 +255,12 @@ public static function showForUser(User $user)
) {
return;
}
- $canedit = ($user->can($users_id, UPDATE) || ($users_id == Session::getLoginUserID()));
+ $canedit = (
+ (
+ $user->can($users_id, UPDATE)
+ && ($user->currentUserHaveMoreRightThan($users_id)))
+ || ($users_id == Session::getLoginUserID())
+ );
parent::showChildsForItemForm($user, '_useremails', $canedit);
}
@@ -271,7 +276,12 @@ public static function showAddEmailButton(User $user)
if (!$user->can($users_id, READ) && ($users_id != Session::getLoginUserID())) {
return false;
}
- $canedit = ($user->can($users_id, UPDATE) || ($users_id == Session::getLoginUserID()));
+ $canedit = (
+ (
+ $user->can($users_id, UPDATE)
+ && ($user->currentUserHaveMoreRightThan($users_id)))
+ || ($users_id == Session::getLoginUserID())
+ );
parent::showAddChildButtonForItemForm($user, '_useremails', $canedit);
diff --git a/templates/components/itilobject/timeline/form_followup.html.twig b/templates/components/itilobject/timeline/form_followup.html.twig
index f9c78392dc5..d5c15f4218a 100644
--- a/templates/components/itilobject/timeline/form_followup.html.twig
+++ b/templates/components/itilobject/timeline/form_followup.html.twig
@@ -306,11 +306,13 @@
var newOption = new Option(data.requesttypes_name, requesttypes_id, true, true);
$("#dropdown_requesttypes_id{{ rand }}").append(newOption).trigger('change');
- // set is_private
- $("#is_private_{{ rand }}")
- .prop("checked", data.is_private == "0"
- ? false
- : true);
+ if (data.is_private !== undefined) {
+ // set is_private
+ $("#is_private_{{ rand }}")
+ .prop("checked", data.is_private == "0"
+ ? false
+ : true);
+ }
// set predefined pending reason
$("#enable-pending-reasons-{{ rand }}")
diff --git a/templates/dropdown_form.html.twig b/templates/dropdown_form.html.twig
index 45c7ce2114b..f60561bd2c7 100644
--- a/templates/dropdown_form.html.twig
+++ b/templates/dropdown_form.html.twig
@@ -64,7 +64,7 @@
{# Dynamically show additional fields unique to certain dropdowns #}
{% for field in additional_fields %}
- {% set fields_params = base_fields_params|merge(field['params'] ?? []) %}
+ {% set fields_params = base_fields_params|merge(field['form_params'] ?? []) %}
{% set type = field['type']|default('') %}
{% set show_field = true %}
{% if field['name'] == 'entities_id' and (type != 'parent' or item.fields['id'] == 0) %}
@@ -206,7 +206,7 @@
{% set field_value %}
{{ item.displaySpecificTypeField(item.fields['id'], field, fields_params) }}
{% endset %}
- {{ fields.field(field['name'], field_value, field['label']) }}
+ {{ fields.field(field['name'], field_value, field['label'], fields_params) }}
{% endif %}
{% elseif field['name'] in picture_fields %}
{% set has_picture_field = true %}
diff --git a/templates/generic_show_form.html.twig b/templates/generic_show_form.html.twig
index e1ea3ff3306..9811d7eb3ec 100644
--- a/templates/generic_show_form.html.twig
+++ b/templates/generic_show_form.html.twig
@@ -385,7 +385,7 @@
specific_field_options
) }}
{% elseif field is same as 'sysdescr' %}
- {{ fields.textareaField('sysdescr', item.fields['sysdescr'], __('Sysdescr')) }}
+ {{ fields.textareaField('sysdescr', item.fields['sysdescr'], __('Sysdescr'), specific_field_options) }}
{% elseif field is same as 'snmpcredentials_id' %}
{{ fields.dropdownField(
'SNMPCredential',
|