Skip to content

Commit 1100e6b

Browse files
committed
We should never do anything if logging with empty msg.
1 parent 39e88af commit 1100e6b

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

Chalmers.ILL/Views/Partials/Chalmers.ILL.Action.LogEntry.cshtml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,21 @@
9696
var newStatusId = newStatusObj.data("status-id");
9797
var newStatusCancellationReasonId = newStatusObj.data("cancellation-reason-id");
9898
var newStatusPurchasedMaterialId = newStatusObj.data("purchased-material-id");
99-
if (newStatusId != -1) {
100-
writeLogItem(@Model.OrderItem.NodeId, obj.form.message.value, 'LOG', obj.form.followUpDate.value, false);
101-
if (newStatusCancellationReasonId != -1) {
102-
setOrderItemStatusAndCancellationReason(@Model.OrderItem.NodeId, newStatusId, newStatusCancellationReasonId);
103-
} else if(newStatusPurchasedMaterialId != -1) {
104-
setOrderItemStatusAndPurchasedMaterial(@Model.OrderItem.NodeId, newStatusId, newStatusPurchasedMaterialId);
99+
if (obj.form.message.value) {
100+
if (newStatusId != -1) {
101+
writeLogItem(@Model.OrderItem.NodeId, obj.form.message.value, 'LOG', obj.form.followUpDate.value, false);
102+
if (newStatusCancellationReasonId != -1) {
103+
setOrderItemStatusAndCancellationReason(@Model.OrderItem.NodeId, newStatusId, newStatusCancellationReasonId);
104+
} else if(newStatusPurchasedMaterialId != -1) {
105+
setOrderItemStatusAndPurchasedMaterial(@Model.OrderItem.NodeId, newStatusId, newStatusPurchasedMaterialId);
106+
} else {
107+
setOrderItemStatus(@Model.OrderItem.NodeId, newStatusId);
108+
}
105109
} else {
106-
setOrderItemStatus(@Model.OrderItem.NodeId, newStatusId);
110+
writeLogItem(@Model.OrderItem.NodeId, obj.form.message.value, 'LOG', obj.form.followUpDate.value);
107111
}
108112
} else {
109-
writeLogItem(@Model.OrderItem.NodeId, obj.form.message.value, 'LOG', obj.form.followUpDate.value);
113+
alert("Du m\u00E5ste skriva n\u00E5got.");
110114
}
111115
}
112116
</script>

0 commit comments

Comments
 (0)