[13092369] Fixed owners list to include only active users and teams. …

…The users list and owners list now match the web client.

src/Views/Owner/List.js

@@ -1,10 +1,12 @@
 define('Mobile/SalesLogix/Views/Owner/List', [
     'dojo/_base/declare',
     'dojo/string',
+    'dojo/_base/array',
     'Sage/Platform/Mobile/List'
 ], function(
     declare,
     string,
+    array,
     List
 ) {
 
@@ -22,12 +24,41 @@ define('Mobile/SalesLogix/Views/Owner/List', [
         security: 'Entities/Owner/View',
         queryOrderBy: 'OwnerDescription',
         querySelect: [
-            'OwnerDescription'
+            'OwnerDescription',
+            'User/Enabled',
+            'User/Type'
         ],
         resourceKind: 'owners',
 
         formatSearchQuery: function(searchQuery) {
             return string.substitute('upper(OwnerDescription) like "%${0}%"', [this.escapeSearchQuery(searchQuery.toUpperCase())]);
+        },
+        processFeed: function(feed) {
+            // Filter the feed in memory (SData cannot check if owner.User is null)
+            if (feed.$resources) {
+                feed.$resources = array.filter(feed.$resources, function(item) {
+                    return this._userEnabled(item) && this._isCorrectType(item);
+                }, this);
+            }
+
+            this.inherited(arguments);
+        },
+        _userEnabled: function(item) {
+            // If User is null, it is probably a team
+            if (item.User === null || item.User.Enabled) {
+                return true;
+            }
+
+            return false;
+        },
+        _isCorrectType: function(item) {
+            // If user is null, it is probably a team
+            if (item.User === null) {
+                return true;
+            }
+
+            // Filter out WebViewer, Retired, Template and AddOn users like the user list does
+            return item.User.Type !== 3 && item.User.Type !== 5 && item.User.Type !== 6 && item.User.Type !== 7;
         }
     });
 });

src/Views/User/List.js

@@ -21,7 +21,14 @@ define('Mobile/SalesLogix/Views/User/List', [
         //View Properties
         id: 'user_list',
         queryOrderBy: 'UserInfo.LastName asc, UserInfo.FirstName asc',
-        queryWhere: 'Enabled eq true',
+
+        // Excluded types for the queryWhere 
+        // Type:
+        // 3 - WebViewer
+        // 5 - Retired
+        // 6 - Template
+        // 7 - AddOn
+        queryWhere: 'Enabled eq true and (Type ne 3 AND Type ne 5 AND Type ne 6 AND Type ne 7)',
         querySelect: [
             'UserInfo/FirstName',
             'UserInfo/LastName',