Commit 5c517cb4 authored by Rosanny Sihombing's avatar Rosanny Sihombing
Browse files

fixing upload pictures

parent 3a4f8cad
...@@ -164,12 +164,35 @@ module.exports = function (app) { ...@@ -164,12 +164,35 @@ module.exports = function (app) {
var projectLogo = req.files.logo var projectLogo = req.files.logo
var projectPicture = req.files.src var projectPicture = req.files.src
// TEST PATH FOR DEVELOPMENT (LOCALHOST) var projectLogoPath, projectPicturePath
var projectLogoPath = './folder-in-server-to-save-projektlogo/'+req.body.pname+'/'+projectLogo.name
var projectPicturePath = './folder-in-server-to-save-projektbild/'+req.body.pname+'/'+projectPicture.name if (projectLogo) {
// PATH FOR TEST/LIVE SERVER // raise error if size limit is exceeded
// var projectLogoPath = to-be-defined if (projectLogo.size === pictSizeLimit) {
// var projectPicturePath = to-be-defined req.flash('error', 'Projektlogo exceeds 1 MB');
res.redirect('/addprojectoverview');
}
else {
// TEST PATH FOR DEVELOPMENT (LOCALHOST)
projectLogoPath = './folder-in-server-to-save-projektlogo/'+req.body.pname+'/'+projectLogo.name
// PATH FOR TEST/LIVE SERVER
// var projectLogoPath = to-be-defined
}
}
if (projectPicture) {
// raise error if size limit is exceeded
if (projectPicture.size === pictSizeLimit) {
req.flash('error', 'Projektbild exceeds 1 MB');
res.redirect('/addprojectoverview');
}
else {
// TEST PATH FOR DEVELOPMENT (LOCALHOST)
projectPicturePath = './folder-in-server-to-save-projektbild/'+req.body.pname+'/'+projectPicture.name
// PATH FOR TEST/LIVE SERVER
// var projectPicturePath = to-be-defined
}
}
var projectTerm = req.body.termForm + " - " + req.body.termTo var projectTerm = req.body.termForm + " - " + req.body.termTo
var projectOverviewData = { var projectOverviewData = {
...@@ -197,34 +220,28 @@ module.exports = function (app) { ...@@ -197,34 +220,28 @@ module.exports = function (app) {
leader_email: req.body.leaderEmail leader_email: req.body.leaderEmail
} }
// raise error if limit is exceeded // save pictures
if (projectLogo && projectLogo.size === pictSizeLimit) { if (projectLogo) {
req.flash('error', 'Projektlogo exceeds 1 MB'); projectLogo.mv(projectLogoPath, function(err) {
res.redirect('/addprojectoverview'); if (err) {
console.error(err)
res.status(500).render(lang+'/500', {
error: err
})
}
});
} }
if (projectPicture && projectPicture.size === pictSizeLimit) { if (projectPicture) {
req.flash('error', 'Projektbild exceeds 1 MB'); projectPicture.mv(projectPicturePath, function(err) {
res.redirect('/addprojectoverview'); if (err) {
console.error(err)
res.status(500).render(lang+'/500', {
error: err
})
}
});
} }
// save pictures
projectLogo.mv('./folder-in-server-to-save-projektlogo/'+req.body.pname+'/'+projectLogo.name, function(err) {
if (err) {
console.error(err)
res.status(500).render(lang+'/500', {
error: err
})
}
});
projectPicture.mv('./folder-in-server-to-save-projektbild/'+req.body.pname+'/'+projectPicture.name, function(err) {
if (err) {
console.error(err)
res.status(500).render(lang+'/500', {
error: err
})
}
});
/* RS: Temporary solution while Project DB is still in early phase. /* RS: Temporary solution while Project DB is still in early phase.
When User DB and Project DB are integrated and quite stabil, this operation should be done in 1 transaction. When User DB and Project DB are integrated and quite stabil, this operation should be done in 1 transaction.
*/ */
......
Supports Markdown
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