Commit 6a620463 authored by Patricio Bruna's avatar Patricio Bruna

Merge pull request #77 from ZBoxApp/issues_resolved

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