Commit bbe2b34f authored by Elias Nahum's avatar Elias Nahum Committed by Juorder Antonio

many issues resolved, list, and modify task massive from domain, in parts,...

many issues resolved, list, and modify task massive from domain, in parts, solved modal change password, etc
parent 2f15a532
...@@ -12,7 +12,7 @@ test: | install ...@@ -12,7 +12,7 @@ test: | install
install: package.json install: package.json
@echo Getting scss-lint using gem @echo Getting scss-lint using gem
@gem install scss_lint #@gem install scss_lint
@echo Getting dependencies using npm @echo Getting dependencies using npm
......
...@@ -111,7 +111,7 @@ export default class DomainMailboxPlans extends React.Component { ...@@ -111,7 +111,7 @@ export default class DomainMailboxPlans extends React.Component {
); );
} }
} else { } else {
console.log(totalLimit); console.log(totalLimit); //eslint-disable-line no-console
totalLimit += plan.limit; totalLimit += plan.limit;
} }
......
...@@ -46,7 +46,7 @@ export default class MultipleTaskModal extends React.Component { ...@@ -46,7 +46,7 @@ export default class MultipleTaskModal extends React.Component {
const collection = []; const collection = [];
const refs = this.refs; const refs = this.refs;
let message = null; let message = null;
let error = false; let err = false;
const isEnabled = refs.zimbraPrefOutOfOfficeReplyEnabled.checked; const isEnabled = refs.zimbraPrefOutOfOfficeReplyEnabled.checked;
const start = refs.zimbraPrefOutOfOfficeFromDate.value; const start = refs.zimbraPrefOutOfOfficeFromDate.value;
...@@ -54,13 +54,13 @@ export default class MultipleTaskModal extends React.Component { ...@@ -54,13 +54,13 @@ export default class MultipleTaskModal extends React.Component {
if ((start > end) && isEnabled) { if ((start > end) && isEnabled) {
message = 'La fecha en la que termina su respuesta automática, debe ser mayor que en la que comienza.'; message = 'La fecha en la que termina su respuesta automática, debe ser mayor que en la que comienza.';
error = true; err = true;
} else if ((start === end) && isEnabled) { } else if ((start === end) && isEnabled) {
message = 'La fecha en la que comienza su respuesta automática no puede ser la misma fecha en la que termina.'; message = 'La fecha en la que comienza su respuesta automática no puede ser la misma fecha en la que termina.';
error = true; err = true;
} }
if (error) { if (err) {
this.setState({ this.setState({
error: true, error: true,
message, message,
...@@ -125,11 +125,13 @@ export default class MultipleTaskModal extends React.Component { ...@@ -125,11 +125,13 @@ export default class MultipleTaskModal extends React.Component {
return null; return null;
}, (error) => { }, (error) => {
console.log(error); console.log(error); //eslint-disable-line no-console
if (this.props.show) { if (this.props.show) {
this.props.onHide(); this.props.onHide();
} }
}); });
return null;
} }
getOwnAccounts(attrs) { getOwnAccounts(attrs) {
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
import $ from 'jquery'; import $ from 'jquery';
import React from 'react'; import React from 'react';
import {Link} from 'react-router';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import * as GlobalActions from '../action_creators/global_actions.jsx'; import * as GlobalActions from '../action_creators/global_actions.jsx';
import {browserHistory, Link} from 'react-router';
import * as Utils from '../utils/utils.jsx'; import * as Utils from '../utils/utils.jsx';
import logo from '../images/logo.png'; import logo from '../images/logo.png';
...@@ -18,14 +18,14 @@ export default class Header extends React.Component { ...@@ -18,14 +18,14 @@ export default class Header extends React.Component {
} }
handleSearch(e) { handleSearch(e) {
//browserHistory.push(`search/?utf8=${utf8}&query=${encodeURIComponent(term)}`);
//const utf8 = ReactDOM.findDOMNode(this.refs.utf8).value.trim();
e.preventDefault(); e.preventDefault();
const search = ReactDOM.findDOMNode(this.refs.query); const search = ReactDOM.findDOMNode(this.refs.query);
const term = search.value.trim(); const term = search.value.trim();
const utf8 = ReactDOM.findDOMNode(this.refs.utf8).value.trim();
search.value = ''; search.value = '';
GlobalActions.emitStartLoading(); GlobalActions.emitStartLoading();
Utils.handleLink(e, `/search/${encodeURIComponent(term)}`); Utils.handleLink(e, `/search/${encodeURIComponent(term)}`);
//browserHistory.push(`search/?utf8=${utf8}&query=${encodeURIComponent(term)}`);
} }
toggleSidebar() { toggleSidebar() {
......
...@@ -46,8 +46,8 @@ export default class BlockGeneralInfoMailbox extends React.Component { ...@@ -46,8 +46,8 @@ export default class BlockGeneralInfoMailbox extends React.Component {
render() { render() {
let blockInfo = null; let blockInfo = null;
let statusCos = null; let statusCos = null;
console.log(ZimbraStore.getAllCos()); console.log(ZimbraStore.getAllCos()); //eslint-disable-line no-console
console.log(this.data); console.log(this.data); //eslint-disable-line no-console
const cosID = Utils.getEnabledPlansObjectByCos(ZimbraStore.getAllCos(), this.props.data.attrs.zimbraCOSId); const cosID = Utils.getEnabledPlansObjectByCos(ZimbraStore.getAllCos(), this.props.data.attrs.zimbraCOSId);
let cosName = null; let cosName = null;
......
...@@ -203,7 +203,7 @@ export default class Mailboxes extends React.Component { ...@@ -203,7 +203,7 @@ export default class Mailboxes extends React.Component {
} }
if (MailboxStore.hasMailboxes() && MailboxStore.hasThisPage(this.state.page)) { if (MailboxStore.hasMailboxes() && MailboxStore.hasThisPage(this.state.page)) {
console.log('has page with data'); console.log('has page with data'); //eslint-disable-line no-console
return resolve(MailboxStore.getMailboxByPage(this.state.page)); return resolve(MailboxStore.getMailboxByPage(this.state.page));
} }
......
...@@ -52,6 +52,7 @@ export default class Pagination extends React.Component { ...@@ -52,6 +52,7 @@ export default class Pagination extends React.Component {
browserHistory.push(`/${this.props.url}${page}`); browserHistory.push(`/${this.props.url}${page}`);
} }
render() { render() {
//let i = 1;
const total = this.props.totalPages; const total = this.props.totalPages;
const current = this.props.currentPage; const current = this.props.currentPage;
const pages = []; const pages = [];
...@@ -61,7 +62,6 @@ export default class Pagination extends React.Component { ...@@ -61,7 +62,6 @@ export default class Pagination extends React.Component {
let next; let next;
let last; let last;
let console; let console;
//let i = 1;
if (current > 1 && current <= total) { if (current > 1 && current <= total) {
first = ( first = (
...@@ -180,4 +180,4 @@ Pagination.propTypes = { ...@@ -180,4 +180,4 @@ Pagination.propTypes = {
Pagination.defaultProps = { Pagination.defaultProps = {
range: 2 range: 2
} };
...@@ -26,7 +26,7 @@ export default class SearchView extends React.Component { ...@@ -26,7 +26,7 @@ export default class SearchView extends React.Component {
GlobalActions.emitEndLoading(); GlobalActions.emitEndLoading();
const query = newProps.params.query; const query = newProps.params.query;
this.makeSearch(query); this.makeSearch(query);
}; }
makeSearch(query) { makeSearch(query) {
Client.search({ Client.search({
...@@ -53,7 +53,7 @@ export default class SearchView extends React.Component { ...@@ -53,7 +53,7 @@ export default class SearchView extends React.Component {
result result
}); });
}, (error) => { }, (error) => {
console.log(error); console.log(error); //eslint-disable-line no-console
}); });
} }
...@@ -77,12 +77,12 @@ export default class SearchView extends React.Component { ...@@ -77,12 +77,12 @@ export default class SearchView extends React.Component {
let url = null; let url = null;
const id = item.id; const id = item.id;
switch(type) { switch (type) {
case 'domain': case 'domain':
tipo = ( tipo = (
<div> <div>
<i className='fa fa-globe fa-lg'></i> <i className='fa fa-globe fa-lg'></i>
<span className='marginLeft'>{'Dominio'}</span> <span className='margin-left'>{'Dominio'}</span>
</div> </div>
); );
...@@ -93,17 +93,17 @@ export default class SearchView extends React.Component { ...@@ -93,17 +93,17 @@ export default class SearchView extends React.Component {
tipo = ( tipo = (
<div> <div>
<i className='fa fa-user fa-lg'></i> <i className='fa fa-user fa-lg'></i>
<span className='marginLeft'>{'Casilla'}</span> <span className='margin-left'>{'Casilla'}</span>
</div> </div>
); );
url = `/mailboxes/${id}`; url = `/mailboxes/${id}`;
break; break;
case 'distributionlist': case 'distributionlist': {
tipo = ( tipo = (
<div> <div>
<i className='fa fa-users fa-lg'></i> <i className='fa fa-users fa-lg'></i>
<span className='marginLeft'>{'Lista de Distribución'}</span> <span className='margin-left'>{'Lista de Distribución'}</span>
</div> </div>
); );
...@@ -120,6 +120,8 @@ export default class SearchView extends React.Component { ...@@ -120,6 +120,8 @@ export default class SearchView extends React.Component {
break; break;
} }
}
return ( return (
<tr <tr
key={id} key={id}
......
.marginLeft { .margin-left {
margin-left: 5px; margin-left: 5px;
} }
...@@ -54,7 +54,7 @@ class MailboxStoreClass extends EventEmitter { ...@@ -54,7 +54,7 @@ class MailboxStoreClass extends EventEmitter {
getMailboxByPage(page) { getMailboxByPage(page) {
if (page && this.currentPage[page]) { if (page && this.currentPage[page]) {
console.log(this.currentPage); console.log(this.currentPage); //eslint-disable-line no-console
return this.currentPage[page]; return this.currentPage[page];
} }
...@@ -89,10 +89,10 @@ class MailboxStoreClass extends EventEmitter { ...@@ -89,10 +89,10 @@ class MailboxStoreClass extends EventEmitter {
if (mailboxesArray) { if (mailboxesArray) {
Array.prototype.push.apply(mailboxexInstances, mailboxes.account); Array.prototype.push.apply(mailboxexInstances, mailboxes.account);
mailboxesArray.account = mailboxexInstances; mailboxesArray.account = mailboxexInstances;
console.log('mailbox', mailboxes); console.log('mailbox', mailboxes); //eslint-disable-line no-console
if (page) { if (page) {
this.currentPage[page] = mailboxes; this.currentPage[page] = mailboxes;
console.log(this.currentPage[page]); console.log(this.currentPage[page]); //eslint-disable-line no-console
} }
return true; return true;
} }
...@@ -101,7 +101,7 @@ class MailboxStoreClass extends EventEmitter { ...@@ -101,7 +101,7 @@ class MailboxStoreClass extends EventEmitter {
mailboxexInstances = mailboxes.account; mailboxexInstances = mailboxes.account;
if (page) { if (page) {
this.currentPage[page] = mailboxes; this.currentPage[page] = mailboxes;
console.log(this.currentPage[page]); console.log(this.currentPage[page]); //eslint-disable-line no-console
} }
return true; return true;
} }
......
...@@ -557,6 +557,8 @@ export function getDomainIdFromDL(dlName, arr) { ...@@ -557,6 +557,8 @@ export function getDomainIdFromDL(dlName, arr) {
} }
} }
} }
return null;
} }
export function getInitialDateFromTimestamp(timestamp) { export function getInitialDateFromTimestamp(timestamp) {
...@@ -587,12 +589,12 @@ export function forceTimestampFromHumanDate(date) { ...@@ -587,12 +589,12 @@ export function forceTimestampFromHumanDate(date) {
return formattedTimeStamp; return formattedTimeStamp;
} }
export function setInitialDate(){ export function setInitialDate() {
const dateInstance = new Date(); const dateInstance = new Date();
const day = dateInstance.getDate().toString().length < 2 ? '0' + dateInstance.getDate().toString() : dateInstance.getDate(); const day = dateInstance.getDate().toString().length < 2 ? '0' + dateInstance.getDate().toString() : dateInstance.getDate();
const month = (dateInstance.getMonth() + 1).toString().length < 2 ? '0' + (dateInstance.getMonth() + 1).toString() : (dateInstance.getMonth() + 1); const month = (dateInstance.getMonth() + 1).toString().length < 2 ? '0' + (dateInstance.getMonth() + 1).toString() : (dateInstance.getMonth() + 1);
const formatted = `${day}/${month}/${dateInstance.getFullYear()}`; const formatted = `${day}/${month}/${dateInstance.getFullYear()}`;
const date = new Date(dateInstance.getFullYear(), dateInstance.getMonth(), dateInstance.getDate(), '00','00','00').getTime(); const date = new Date(dateInstance.getFullYear(), dateInstance.getMonth(), dateInstance.getDate(), '00', '00', '00').getTime();
const dateObject = { const dateObject = {
timestamp: date, timestamp: date,
formatted formatted
......
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