From cdcc2791cdaf409a10429b18b35cb7804c519f78 Mon Sep 17 00:00:00 2001
From: Mark Moffat <hi@markmoffat.com>
Date: Sun, 7 Jan 2018 14:10:39 +0100
Subject: [PATCH] Fix image directories issue

---
 routes/admin.js        | 13 ++++++-------
 views/product_edit.hbs | 11 ++++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/routes/admin.js b/routes/admin.js
index 18390d9..d220ff3 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -571,7 +571,7 @@ router.get('/product/delete/:id', common.restrict, (req, res) => {
 // users
 router.get('/users', common.restrict, (req, res) => {
     let db = req.app.db;
-    common.dbQuery(db.users, {}, null, null, (err, users) => {
+    db.users.find({}).toArray((err, users) => {
         if(err){
             console.info(err.stack);
         }
@@ -1083,7 +1083,6 @@ router.post('/product/setasmainimage', common.restrict, (req, res) => {
 
     // update the productImage to the db
     db.products.update({_id: common.getId(req.body.product_id)}, {$set: {productImage: req.body.productImage}}, {multi: false}, (err, numReplaced) => {
-        console.log(err, numReplaced);
         if(err){
             res.status(400).json({message: 'Unable to set as main image. Please try again.'});
         }else{
@@ -1162,7 +1161,7 @@ router.post('/file/upload', common.restrict, upload.single('upload_file'), (req,
         });
 
         // get the product form the DB
-        db.products.findOne({_id: common.getId(req.body.directory)}, (err, product) => {
+        db.products.findOne({_id: common.getId(req.body.productId)}, (err, product) => {
             if(err){
                 console.info(err.stack);
             }
@@ -1170,24 +1169,24 @@ router.post('/file/upload', common.restrict, upload.single('upload_file'), (req,
 
             // if there isn't a product featured image, set this one
             if(!product.productImage){
-                db.products.update({_id: common.getId(req.body.directory)}, {$set: {productImage: imagePath}}, {multi: false}, (err, numReplaced) => {
+                db.products.update({_id: common.getId(req.body.productId)}, {$set: {productImage: imagePath}}, {multi: false}, (err, numReplaced) => {
                     if(err){
                         console.info(err.stack);
                     }
                     req.session.message = 'File uploaded successfully';
                     req.session.messageType = 'success';
-                    res.redirect('/admin/product/edit/' + req.body.directory);
+                    res.redirect('/admin/product/edit/' + req.body.productId);
                 });
             }else{
                 req.session.message = 'File uploaded successfully';
                 req.session.messageType = 'success';
-                res.redirect('/admin/product/edit/' + req.body.directory);
+                res.redirect('/admin/product/edit/' + req.body.productId);
             }
         });
     }else{
         req.session.message = 'File upload error. Please select a file.';
         req.session.messageType = 'danger';
-        res.redirect('/admin/product/edit/' + req.body.directory);
+        res.redirect('/admin/product/edit/' + req.body.productId);
     }
 });
 
diff --git a/views/product_edit.hbs b/views/product_edit.hbs
index 945dced..cf57cc6 100644
--- a/views/product_edit.hbs
+++ b/views/product_edit.hbs
@@ -110,11 +110,11 @@
                 <h2>Product images</h2>
                 {{#if images}}
                 <div class="row">
-                    <div class="col-md-10 col-md-offset-2"> 
+                    <div class="col-md-10 col-md-offset-2">
                     {{#each images}}
-                        <div class="col-md-3">                   
+                        <div class="col-md-3">
                             <p>
-                                <a data-id="{{this.path}}" class="btn-delete-image btn btn-danger btn-sm">Delete</a> 
+                                <a data-id="{{this.path}}" class="btn-delete-image btn btn-danger btn-sm">Delete</a>
                                 {{#ifCond this.productImage '==' true}}
                                     <span class="label label-info">main image</span>
                                 {{else}}
@@ -148,7 +148,8 @@
                     <span class="btn btn-info btn-file">
                         Select file<input type="file" name="upload_file" id="upload_file">
                     </span>
-                    <input type="hidden" id="directory" name="directory" value="{{result._id}}"/>
+                    <input type="hidden" id="productId" name="productId" value="{{result._id}}"/>
+                    <input type="hidden" id="directory" name="directory" value="{{result.productPermalink}}"/>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
@@ -162,7 +163,7 @@
 <link href="https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.2/summernote.css" rel="stylesheet">
 <script>
     $(document).ready(function() {
-        $('#editor').summernote({  
+        $('#editor').summernote({
             height: 300,
             minHeight: null
         });