Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-06 09:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

- Fix lint errors.

Browse source 
Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2019-01-04 11:00:33 +02:00
parent 2b53fae16f
commit f5339ef97f
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/components/rules/rulesMain.js
View file

@ -1,4 +1,4 @@
const rulesMainComponent = BlazeComponent.extendComponent({ BlazeComponent.extendComponent({
onCreated() { onCreated() {
this.rulesCurrentTab = new ReactiveVar('rulesList'); this.rulesCurrentTab = new ReactiveVar('rulesList');
this.ruleName = new ReactiveVar(''); this.ruleName = new ReactiveVar('');
@ -11,7 +11,7 @@ const rulesMainComponent = BlazeComponent.extendComponent({
}, },
sanitizeObject(obj){ sanitizeObject(obj){
Object.keys(obj).forEach((key) => { Object.keys(obj).forEach((key) => {
if(obj[key] == '' || obj[key] == undefined){ if(obj[key] === '' || obj[key] === undefined){
obj[key] = '*'; obj[key] = '*';
}} }}
); );
@ -52,9 +52,9 @@ const rulesMainComponent = BlazeComponent.extendComponent({
const username = $(event.currentTarget.offsetParent).find('.user-name').val(); const username = $(event.currentTarget.offsetParent).find('.user-name').val();
let trigger = this.triggerVar.get(); let trigger = this.triggerVar.get();
trigger.userId = '*'; trigger.userId = '*';
if(username != undefined ){ if(username !== undefined ){
const userFound = Users.findOne({username}); const userFound = Users.findOne({username});
if(userFound != undefined){ if(userFound !== undefined){
trigger.userId = userFound._id; trigger.userId = userFound._id;
this.triggerVar.set(trigger); this.triggerVar.set(trigger);
} }

4
client/components/rules/triggers/boardTriggers.js
View file

@ -13,8 +13,8 @@ BlazeComponent.extendComponent({
'click .js-open-card-title-popup'(event){ 'click .js-open-card-title-popup'(event){
const funct = Popup.open('boardCardTitle'); const funct = Popup.open('boardCardTitle');
const divId = $(event.currentTarget.parentNode.parentNode).attr('id'); const divId = $(event.currentTarget.parentNode.parentNode).attr('id');
console.log('current popup'); //console.log('current popup');
console.log(this.currentPopupTriggerId); //console.log(this.currentPopupTriggerId);
this.currentPopupTriggerId = divId; this.currentPopupTriggerId = divId;
funct.call(this, event); funct.call(this, event);
}, },

4
client/lib/utils.js
View file

@ -220,7 +220,7 @@ Utils = {
finalString += element.text().toLowerCase(); finalString += element.text().toLowerCase();
} else if (element.hasClass('user-details')) { } else if (element.hasClass('user-details')) {
let username = element.find('input').val(); let username = element.find('input').val();
if(username == undefined || username == ''){ if(username === undefined || username === ''){
username = '*'; username = '*';
} }
finalString += `${element.find('.trigger-text').text().toLowerCase() } ${ username}`; finalString += `${element.find('.trigger-text').text().toLowerCase() } ${ username}`;
@ -228,7 +228,7 @@ Utils = {
finalString += element.find('select option:selected').text().toLowerCase(); finalString += element.find('select option:selected').text().toLowerCase();
} else if (element.find('input').length > 0) { } else if (element.find('input').length > 0) {
let inputvalue = element.find('input').val(); let inputvalue = element.find('input').val();
if(inputvalue == undefined || inputvalue == ''){ if(inputvalue === undefined || inputvalue === ''){
inputvalue = '*'; inputvalue = '*';
} }
finalString += inputvalue; finalString += inputvalue;

4
server/rulesHelper.js
View file

@ -150,12 +150,12 @@ RulesHelper = {
let listId = ''; let listId = '';
let swimlaneId = ''; let swimlaneId = '';
const swimlane = Swimlanes.findOne({title:action.swimlaneName, boardId}); const swimlane = Swimlanes.findOne({title:action.swimlaneName, boardId});
if(list == undefined){ if(list === undefined){
listId = ''; listId = '';
}else{ }else{
listId = list._id; listId = list._id;
} }
if(swimlane == undefined){ if(swimlane === undefined){
swimlaneId = Swimlanes.findOne({title:'Default', boardId})._id; swimlaneId = Swimlanes.findOne({title:'Default', boardId})._id;
}else{ }else{
swimlaneId = swimlane._id; swimlaneId = swimlane._id;