Merge pull request #33 from ZBoxApp/fix-admins

Fix admins for companies and domains

src/components/companies/companies.jsx

@@ -53,6 +53,7 @@ export default class Companies extends React.Component {
 
             return Promise.all(domains).then((comps) => {
                 CompaniesStore.setCompanies(comps);
+
                 self.setState({
                     companies: comps
                 });
@@ -102,7 +103,7 @@ export default class Companies extends React.Component {
                             return rej(err);
                         }
 
-                        d.admins = admins;
+                        d.admins = admins.account;
                         return solve(d);
                     });
                 });

src/components/companies/company_admins.jsx

@@ -23,7 +23,9 @@ export default class CompanyAdmins extends React.Component {
 
         if (domains) {
             domains.forEach((d) => {
+                if (d.admins) {
                     Reflect.apply(Array.prototype.push, admins, d.admins);
+                }
             });
         }
 

src/components/companies/company_details.jsx

@@ -98,8 +98,7 @@ export default class CompaniesDetails extends React.Component {
                         if (err) {
                             return rej(err);
                         }
-
-                        d.admins = admins;
+                        d.admins = admins.account;
                         return solve(d);
                     });
                 });

src/components/domain/domain_admin_list.jsx

@@ -28,7 +28,8 @@ export default class DomainAdminList extends React.Component {
     }
     getAdmins() {
         const domain = this.props.domain;
-        domain.getAdmins((err, admins) => {
+        domain.getAdmins((err, data) => {
+            const admins = data.account;
             DomainStore.setAdmins(domain, admins);
             this.setState({admins});
         });

src/utils/client.jsx

@@ -11,8 +11,6 @@ import * as GlobalActions from '../action_creators/global_actions.jsx';
 import * as Utils from './utils.jsx';
 import Constants from './constants.jsx';
 
-// arguments.callee.name
-
 // función que maneja el error como corresponde
 function handleError(methodName, err) {
     if (err.extra &&
@@ -474,3 +472,24 @@ export function search(query, success, error) {
         }
     );
 }
+
+export function batchRequest(requestArray, success, error) {
+    initZimbra().then(
+        (zimbra) => {
+            zimbra.makeBatchRequest(
+                requestArray,
+                (err, data) => {
+                    if (err) {
+                        const e = handleError('batchRequest', err);
+                        return error(e);
+                    }
+
+                    return success(data);
+                });
+        },
+        (err) => {
+            const e = handleError('batchRequest', err);
+            return error(e);
+        }
+    );
+}