Merge pull request #8 from Lantzify/main

Fixes for ticket types
Weberistic · Feb 22, 2023 · 3f5043a · 3f5043a
2 parents 271af5a + 3c3b0c7
commit 3f5043a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...port/App_Plugins/uSupport/backoffice/ticketTypes/apps/ticketType/ticketType.controller.js b/...port/App_Plugins/uSupport/backoffice/ticketTypes/apps/ticketType/ticketType.controller.js
@@ -29,7 +29,7 @@
             }
         ];
 
-        if ($scope.model.ticketType) {
+        if ($scope.model.ticketType && $scope.model.ticketType.PropertyId) {
             uSupportTicketTypeResources.getDataTypeFromId($scope.model.ticketType.PropertyId).then(function (type) {
                 $scope.model.properties[0].value = $scope.model.ticketType.PropertyName;
                 $scope.model.properties[1].value = $scope.model.ticketType.PropertyDescription;

diff --git a/src/uSupport/App_Plugins/uSupport/backoffice/ticketTypes/ticketTypes.edit.controller.js b/src/uSupport/App_Plugins/uSupport/backoffice/ticketTypes/ticketTypes.edit.controller.js
@@ -75,7 +75,7 @@
             vm.ticketType.Icon = iconArr[0];
             vm.ticketType.Color = iconArr[1];
             vm.ticketType.PropertyName = vm.properties[0].value;
-            vm.ticketType.PropertyDescription = vm.properties[0].value;
+            vm.ticketType.PropertyDescription = vm.properties[1].value;
 
             if (vm.properties[2].singleDropdownValue !== '') {
                 uSupportTicketTypeResources.getDataTypeFromName(vm.properties[2].singleDropdownValue).then(function (dataType) {