use findUsers to get newsletter status of selected users, fixes #2276

pandora/user/views.py

@@ -415,7 +415,7 @@ actions.register(findUser)
 def parse_query(data, user):
     query = {}
     query['range'] = [0, 100]
-    query['sort'] = [{'key':'name', 'operator':'+'}]
+    query['sort'] = [{'key':'username', 'operator':'+'}]
     for key in ('keys', 'range', 'sort', 'query'):
         if key in data:
             query[key] = data[key]
@@ -441,6 +441,7 @@ def order_query(qs, sort):
             'system': 'system',
             'timesseen': 'timesseen',
             'useragent': 'useragent',
+            'user': 'username',
             'username': 'username',
             'numberoflists': 'numberoflists',
             'windowsize': 'windowsize',

static/js/usersDialog.js

@@ -600,15 +600,23 @@ pandora.ui.usersDialog = function() {
         return ret;
     };
 
-    function getTo() {
-        return $list.options('selected').map(function(id) {
-            return $list.value(id);
-        }).filter(function(user) {
-            return ['guest', 'robot'].indexOf(user.level) == -1 && (
-                $mailForm.values().include == 'users' || user.newsletter
-            );
+    function getTo(callback) {
+        pandora.api.findUsers({
+            query: {conditions: [
+                {key: 'level', value: 'guest', operator: '!='},
+                {key: 'level', value: 'robot', operator: '!='}
+            ], operator: '&'},
+            keys: ['id', 'username', 'newsletter'],
+            range: [0, numberOfUsers],
+            sort: [{key: 'username', operator: '+'}]
+        }, function(result) {
+            var selected = $list.options('selected');
+            callback(result.data.items.filter(function(user) {
+                return selected.indexOf(user.id) > -1
+                    && ($mailForm.values().include == 'users' || user.newsletter);
             }).map(function(user) {
                 return user.username;
+            }));
         });
     }
 
@@ -766,8 +774,7 @@ pandora.ui.usersDialog = function() {
                     })
                     .bindEvent({
                         change: function() {
-                            setTo();
-                            setSend();
+                            setTo(setSend);
                         }
                     }),
                 Ox.Input({
@@ -835,8 +842,7 @@ pandora.ui.usersDialog = function() {
                 $form.append($editForm = renderEditForm());
             }
         } else {
-            setTo();
-            setSend();
+            setTo(setSend);
             setWidth();
             $editForm && $editForm.remove();
             $form.append($mailForm);
@@ -858,15 +864,15 @@ pandora.ui.usersDialog = function() {
                 $form.append($editForm = renderEditForm());
             }
         } else {
-            setTo();
-            setSend();
+            setTo(setSend);
         }
     }
 
     function sendMail() {
         $sendButton.options({title: Ox._('Sending'), disabled: true});
+        getTo(function(to) {
             pandora.api.mail({
-            to: getTo(),
+                to: to,
                 subject: getFormItemById('subject').value(),
                 message: getFormItemById('message').value(),
                 receipt: getFormItemById('receipt').value()
@@ -893,6 +899,7 @@ pandora.ui.usersDialog = function() {
                     }).open();
                 $sendButton.options({title: Ox._('Send'), disabled: false});
             });
+        });
     }
 
     function setHeight(data) {
@@ -927,11 +934,14 @@ pandora.ui.usersDialog = function() {
         }); 
     }
 
-    function setTo() {
-        var recipients = getTo().length;
+    function setTo(callback) {
+        getTo(function(to) {
+            var recipients = to.length;
             $mailForm.values({
                 to: Ox.formatCount(recipients, 'recipient').replace('no', 'No')
             });
+            callback();
+        });
     }
 
     function setWidth() {