ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sqlQuery Conversion : Fix syntax errors

add-archived-and-accountType-columns
Moe 2020-08-05 18:15:10 -07:00
parent 86c1689df2
commit c56fbc1d93
12 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/scheduler.js
View File

@ -279,7 +279,7 @@ module.exports = function(s,config,lang,app,io){
}
s.knexQuery({
action: "update",
table: "Monitors",
table: "Schedules",
update: insertData,
where: [
['ke','=',req.params.ke],

2
libs/socketio.js
View File

@ -547,7 +547,6 @@ module.exports = function(s,config,lang,io){
}else if(!permissions.sub||permissions.allmonitors!=='0'||permissions.monitors.indexOf(d.mid)>-1){
monitorRestrictions.push(['mid','=',d.mid])
}
console.log('monitorRestrictions',monitorRestrictions,monitorRestrictions.length)
var getEvents = function(callback){
var eventWhereQuery = [
['ke','=',cn.ke],
@ -563,7 +562,6 @@ module.exports = function(s,config,lang,io){
if(monitorRestrictions.length > 0){
eventWhereQuery.push(monitorRestrictions)
}
console.log(eventWhereQuery)
s.knexQuery({
action: "select",
columns: "*",

6
libs/timelapse.js
View File

@ -116,14 +116,16 @@ module.exports = function(s,config,lang,app,io){
action: "select",
columns: "*",
table: "Cloud Timelapse Frames",
where: frameSelector
where: frameSelector,
limit: 1
},function(err,r){
if(r && r[0]){
r = r[0]
s.knexQuery({
action: "delete",
table: "Cloud Timelapse Frames",
where: frameSelector
where: frameSelector,
limit: 1
},function(){
s.onDeleteTimelapseFrameFromCloudExtensionsRunner(e,r)
})

4
libs/uploaders/amazonS3.js
View File

@ -3,8 +3,8 @@ module.exports = function(s,config,lang){
//Amazon S3
var beforeAccountSaveForAmazonS3 = function(d){
//d = save event
d.form.details.aws_use_global=d.d.aws_use_global
d.form.details.use_aws_s3=d.d.use_aws_s3
d.formDetails.aws_use_global=d.d.aws_use_global
d.formDetails.use_aws_s3=d.d.use_aws_s3
}
var cloudDiskUseStartupForAmazonS3 = function(group,userDetails){
group.cloudDiskUse['s3'].name = 'Amazon S3'

4
libs/uploaders/backblazeB2.js
View File

@ -3,8 +3,8 @@ module.exports = function(s,config,lang){
//Backblaze B2
var beforeAccountSaveForBackblazeB2 = function(d){
//d = save event
d.form.details.b2_use_global=d.d.b2_use_global
d.form.details.use_bb_b2=d.d.use_bb_b2
d.formDetails.b2_use_global=d.d.b2_use_global
d.formDetails.use_bb_b2=d.d.use_bb_b2
}
var cloudDiskUseStartupForBackblazeB2 = function(group,userDetails){
group.cloudDiskUse['b2'].name = 'Backblaze B2'

4
libs/uploaders/googleDrive.js
View File

@ -54,8 +54,8 @@ module.exports = (s,config,lang,app,io) => {
//Google Drive Storage
var beforeAccountSaveForGoogleDrive = function(d){
//d = save event
d.form.details.googd_use_global = d.d.googd_use_global
d.form.details.use_googd = d.d.use_googd
d.formDetails.googd_use_global = d.d.googd_use_global
d.formDetails.use_googd = d.d.use_googd
}
var cloudDiskUseStartupForGoogleDrive = function(group,userDetails){
group.cloudDiskUse['googd'].name = 'Google Drive Storage'

4
libs/uploaders/s3based.js
View File

@ -3,8 +3,8 @@ module.exports = function(s,config,lang){
//Wasabi Hot Cloud Storage
var beforeAccountSaveForWasabiHotCloudStorage = function(d){
//d = save event
d.form.details.whcs_use_global=d.d.whcs_use_global
d.form.details.use_whcs=d.d.use_whcs
d.formDetails.whcs_use_global=d.d.whcs_use_global
d.formDetails.use_whcs=d.d.use_whcs
}
var cloudDiskUseStartupForWasabiHotCloudStorage = function(group,userDetails){
group.cloudDiskUse['whcs'].name = 'Wasabi Hot Cloud Storage'

2
libs/uploaders/sftp.js
View File

@ -8,7 +8,7 @@ module.exports = function(s,config,lang){
}
var beforeAccountSaveForSftp = function(d){
//d = save event
d.form.details.use_sftp = d.d.use_sftp
d.formDetails.use_sftp = d.d.use_sftp
}
var loadSftpForUser = function(e){
// e = user

4
libs/uploaders/webdav.js
View File

@ -4,8 +4,8 @@ module.exports = function(s,config,lang){
// WebDAV
var beforeAccountSaveForWebDav = function(d){
//d = save event
d.form.details.webdav_use_global=d.d.webdav_use_global
d.form.details.use_webdav=d.d.use_webdav
d.formDetails.webdav_use_global=d.d.webdav_use_global
d.formDetails.use_webdav=d.d.use_webdav
}
var cloudDiskUseStartupForWebDav = function(group,userDetails){
group.cloudDiskUse['webdav'].name = 'WebDAV'

26
libs/user.js
View File

@ -104,14 +104,15 @@ module.exports = function(s,config,lang){
var selectedDate = frame.filename.split('T')[0]
var dir = s.getTimelapseFrameDirectory(frame)
var fileLocationMid = `${dir}` + frame.filename
var whereGroup
if(didOne){
const whereGroup = [
whereGroup = [
['or','mid','=',frame.mid],
['time','=',frame.time]
]
}else{
didOne = false
const whereGroup = [
whereGroup = [
['mid','=',frame.mid],
['time','=',frame.time]
]
@ -171,14 +172,15 @@ module.exports = function(s,config,lang){
files.forEach(function(file){
var dir = s.getFileBinDirectory(file)
var fileLocationMid = `${dir}` + file.name
var whereGroup
if(didOne){
const whereGroup = [
whereGroup = [
['or','mid','=',file.mid],
['name','=',file.name]
]
}else{
didOne = false
const whereGroup = [
whereGroup = [
['mid','=',file.mid],
['name','=',file.name]
]
@ -520,14 +522,15 @@ module.exports = function(s,config,lang){
var didOne = false
videos.forEach(function(video){
video.dir = s.getVideoDirectory(video) + s.formattedTime(video.time) + '.' + video.ext
var whereGroup
if(didOne){
const whereGroup = [
whereGroup = [
['or','mid','=',video.mid],
['time','=',video.time]
]
}else{
didOne = false
const whereGroup = [
whereGroup = [
['mid','=',video.mid],
['time','=',video.time]
]
@ -579,14 +582,15 @@ module.exports = function(s,config,lang){
]
frames.forEach(function(frame){
frame.dir = s.getVideoDirectory(frame) + s.formattedTime(frame.time) + '.' + frame.ext
var whereGroup
if(didOne){
const whereGroup = [
whereGroup = [
['or','mid','=',frame.mid],
['time','=',frame.time]
]
}else{
didOne = false
const whereGroup = [
whereGroup = [
['mid','=',frame.mid],
['time','=',frame.time]
]
@ -707,7 +711,11 @@ module.exports = function(s,config,lang){
var formDetails = JSON.parse(form.details)
if(!dontRunExtensions){
s.beforeAccountSaveExtensions.forEach(function(extender){
extender(d)
extender({
form: form,
formDetails: formDetails,
d: details
})
})
}
//admin permissions

2
libs/webServerAdminPaths.js
View File

@ -511,7 +511,7 @@ module.exports = function(s,config,lang,app){
}
s.knexQuery({
action: "insert",
table: "Monitors",
table: "Presets",
insert: insertData
})
s.tx({

1
libs/webServerSuperPaths.js
View File

@ -405,7 +405,6 @@ module.exports = function(s,config,lang,app){
table: "Monitors",
where: [
['ke','=',account.ke],
['mid','=',form.mid],
]
},(err,monitors) => {
if(monitors && monitors[0]){