Merge branch 'master' into feature/OAM-64

OpenLMIS-Angola · May 22, 2024 · 72fa91d · 72fa91d
2 parents fb0b3b3 + f1db79e
commit 72fa91d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/admin-system-notification-list/system-notification-list.controller.js b/src/admin-system-notification-list/system-notification-list.controller.js
@@ -147,6 +147,7 @@
                     {
                         header: 'adminSystemNotificationList.isDisplayed',
                         propertyPath: 'isDisplayed',
+                        sortable: false,
                         template: function(item) {
                             return '<openlmis-ok-icon show="' + item.isDisplayed + '"></openlmis-ok-icon>';
                         }

diff --git a/src/admin-user-list/user-list.controller.js b/src/admin-user-list/user-list.controller.js
@@ -190,7 +190,8 @@
                     },
                     {
                         header: 'adminUserList.email',
-                        propertyPath: 'email'
+                        propertyPath: 'email',
+                        sortable: false
                     }
                 ],
                 actions: {

diff --git a/src/order-fulfillment/order-fulfillment.controller.js b/src/order-fulfillment/order-fulfillment.controller.js
@@ -201,6 +201,7 @@
                     {
                         header: 'orderFulfillment.orderingFacility',
                         propertyPath: 'facility',
+                        sortable: false,
                         template: function(item) {
                             return $filter('facility')(item.facility);
                         }