Commit bd954f1d authored by Patricio Bruna's avatar Patricio Bruna

Merge pull request #116 from ZBoxApp/issues_resolved_manager

fixed getCompany function become it to a promise, change text when ha…
parents 1c19e019 9665acbe
module.exports = {"main":{"js":"/220281bundle.js"}} module.exports = {"main":{"js":"/898860bundle.js"}}
\ No newline at end of file \ No newline at end of file
...@@ -185,7 +185,7 @@ export default class DomainMailboxPlans extends React.Component { ...@@ -185,7 +185,7 @@ export default class DomainMailboxPlans extends React.Component {
} else { } else {
panelBody = ( panelBody = (
<div className='text-center'> <div className='text-center'>
<h4 className='text-danger'>{'No posee casillas asignadas a su dominio.'}</h4> <h4 className='text-danger'>{'No se han asignado límites de casillas.'}</h4>
</div> </div>
); );
} }
......
...@@ -287,14 +287,20 @@ export default class EditDomain extends React.Component { ...@@ -287,14 +287,20 @@ export default class EditDomain extends React.Component {
]; ];
return ( return (
<Panel <div className='content animate-panel'>
title={'Editar Dominio'} <div className='row'>
btnsHeader={actions} <div className='col-md-12 central-content'>
classHeader={'forum-box'} <Panel
error={messageBar} title={'Editar Dominio'}
> btnsHeader={actions}
{form} classHeader={'forum-box'}
</Panel> error={messageBar}
>
{form}
</Panel>
</div>
</div>
</div>
); );
} }
......
...@@ -172,21 +172,23 @@ export function getAllCompanies() { ...@@ -172,21 +172,23 @@ export function getAllCompanies() {
}); });
} }
export function getCompany(id, success, error) { export function getCompany(id) {
const url = global.window.manager_config.companiesEndPoints.detail.replace('{id}', id); const url = global.window.manager_config.companiesEndPoints.detail.replace('{id}', id);
return $.ajax({ return new Promise((resolve, reject) => {
url, return $.ajax({
beforeSend: function setApiToken(xhrObj) { url,
xhrObj.setRequestHeader('x-api-key', window.manager_config.user_token); beforeSend: function setApiToken(xhrObj) {
}, xhrObj.setRequestHeader('x-api-key', window.manager_config.user_token);
dataType: 'json', },
success: function onSuccess(data) { dataType: 'json',
success(data); success: function onSuccess(data) {
}, resolve(data);
error: function onError(xhr) { },
error(xhr.responseJSON); error: function onError(xhr) {
} reject(xhr.responseJSON);
}
});
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment