fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/3.8.1 (pull request #8676)

Browse Source 
Updating feature branch with the last commits in branch release/3.8.1
This commit is contained in:
Julio Cesar Laura Avendaño
2023-01-05 15:41:17 +00:00
parent c39deff8e4 9c97548fd0
commit c698a4e1f5
4 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/templates/cases/pmdynaform.html
View File

@@ -26,6 +26,10 @@
<script type="text/javascript" src="/lib/pmdynaform/libs/html5/html5.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/bootstrap-notify-3.1.3/bootstrap-notify.min.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/decimal/decimal.js"></script>
<script type="module">
import Decimal from '/lib/pmdynaform/libs/decimal/decimal_m.js';
</script>
</head>
<body style="height:100%">
<div id="container" style="height:100%;display:none;"></div>

14
workflow/engine/templates/roles/rolesUsersPermission.js
View File

@@ -915,12 +915,16 @@ AssignPermissionAction = function(){
* @returns {void}
*/
RemovePermissionAction = function () {
if (ROLES.ROL_UID === pm_admin) {
var message = _('ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE');
Ext.Msg.alert(_('ID_INFORMATION'), message);
return;
}
rowsSelected = assignedGrid.getSelectionModel().getSelections();
for (var a = 0; a < rowsSelected.length; a++) {
if (ROLES.ROL_UID === pm_admin) {
if (rowsSelected[a].json.TYPE !== 'CUSTOM') {
var message = _('ID_THE_PERMISSION_CAN_NOT_BE_UNASSIGNED_FROM_THIS_ROLE');
Ext.Msg.alert(_('ID_INFORMATION'), message);
return;
}
}
}
var arrAux = new Array();
var sw;
for (var a = 0; a < rowsSelected.length; a++) {