Merge branch 'upload'

Conflicts: views/listview.html
simov · Dec 5, 2013 · f09f416 · f09f416
2 parents 7a589d4 + acdc658
commit f09f416
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ results
 
 npm-debug.log
 node_modules
+public/upload
diff --git a/app.js b/app.js
@@ -69,6 +69,10 @@ function initSettings (args) {
         args.config.app.root = '';
     }
 
+    var upload = args.config.app.upload || path.join(__dirname, 'public/upload');
+    args.config.app.upload = upload;
+    if (!fs.existsSync(upload)) fs.mkdirSync(upload);
+
     args.langs = (function () {
         var dpath = path.join(__dirname, 'config/lang'),
             files = fs.readdirSync(dpath),
@@ -201,7 +205,7 @@ function initServer (args) {
 
     // editview
     app.get(routes.editview, r.auth.restrict, r.editview.get, r.render.admin);
-    app.post(routes.editview, r.auth.restrict, r.editview.post, r.render.admin);
+    app.post(routes.editview, r.auth.restrict, r.upload.files, r.editview.post, r.render.admin);
 
     // listview
     app.get(routes.listview, r.auth.restrict, r.listview.get, r.render.admin);

diff --git a/public/express-admin.css b/public/express-admin.css
@@ -23,6 +23,7 @@
 
 /*editview*/
 .btn-today { line-height: 240%; }
+[type=file] { margin-top: 4px; }
 
 /*fix for all fields*/
 .ex-table .form-group { margin-bottom: 0; }

diff --git a/public/express-admin.js b/public/express-admin.js
@@ -37,6 +37,10 @@ Date.prototype.toJSONLocal = function() {
         if ($('.form-group .form-control', self).length)
             return $('.form-group .form-control', self);
     }
+    function getFileControl (self) {
+        if ($('.form-group [type=file]', self).length)
+            return $('.form-group [type=file]', self);
+    }
     return {
         inlines: function () {
             $('.add-another').on('click', function (e) {
@@ -55,6 +59,11 @@ Date.prototype.toJSONLocal = function() {
                         name = control.attr('name') || '';
                     control.attr('name', 
                         name.replace('blank', 'records').replace('index', index));
+
+                    var fileControl = getFileControl(this);
+                    if (fileControl)
+                    fileControl.attr('name', 
+                        name.replace('blank', 'records').replace('index', index));
                 });
                 // set keys for insert
                 (function () {

diff --git a/routes/editview.js b/routes/editview.js
@@ -40,7 +40,7 @@ exports.post = function (req, res, next) {
             action = req.body.action,
             table = Object.keys(view)[0];
 
-        if (action.hasOwnProperty('remove')) {
+        if ({}.hasOwnProperty.call(action, 'remove')) {
             // should be based on constraints
             args.action = 'remove';
 
@@ -70,20 +70,20 @@ exports.post = function (req, res, next) {
 
             // based on clicked button
             switch (true) {
-                case action.hasOwnProperty('remove'):
+                case {}.hasOwnProperty.call(action, 'remove'):
                     // the message should be different for delete
                     req.session.success = true;
                     res.redirect(res.locals.root+'/'+args.slug);
                     break;
-                case action.hasOwnProperty('save'):
+                case {}.hasOwnProperty.call(action, 'save'):
                     req.session.success = true;
                     res.redirect(res.locals.root+'/'+args.slug);
                     break;
-                case action.hasOwnProperty('another'):
+                case {}.hasOwnProperty.call(action, 'another'):
                     req.session.success = true;
                     res.redirect(res.locals.root+'/'+args.slug+'/add');
                     break;
-                case action.hasOwnProperty('continue'):
+                case {}.hasOwnProperty.call(action, 'continue'):
                     req.session.success = true;
                     if (args.debug) return render(req, res, next, data, args);
                     res.redirect(res.locals.root+'/'+args.slug+'/'+args.id);

diff --git a/routes/index.js b/routes/index.js
@@ -6,5 +6,6 @@ exports.notfound = require('./404');
 exports.mainview = require('./mainview');
 exports.listview = require('./listview');
 exports.editview = require('./editview');
+exports.upload   = require('./upload');
 
 exports.render   = require('./render');
diff --git a/routes/upload.js b/routes/upload.js
@@ -0,0 +1,77 @@
+
+var fs = require('fs'),
+    path = require('path');
+
+
+// prevent overriding of existing files
+function getName (target, cb) {
+    var ext = path.extname(target),
+        fname = path.basename(target, ext),
+        dpath = path.dirname(target);
+    fs.exists(target, function (exists) {
+        return exists ? loop(1) : cb(target, fname+ext);
+    });
+    function loop (i) {
+        var name = fname+'-'+i,
+            fpath = path.join(dpath, name+ext);
+        fs.exists(fpath, function (exists) {
+            return exists ? loop(++i) : cb(fpath, name+ext);
+        });
+    }
+}
+
+function processFile (file, dpath, cb) {
+    if (!file.name) return cb(null, file.name);
+    // file.name; // file-name.jpg
+    // file.path; // /tmp/9c9b10b72fe71be752bd3895f1185bc8
+
+    var source = file.path,
+        target = path.join(dpath, file.name);
+
+    fs.readFile(source, function (err, data) {
+        if (err) return cb(err);
+        getName(target, function (target, fname) {
+            fs.writeFile(target, data, function (err) {
+                if (err) return cb(err);
+                cb(null, fname);
+            });
+        });
+    });
+}
+
+function setName (req, file, fname) {
+    var m = file.fieldName.match(/(.+)\[(.+)\]\[records\]\[(\d+)\]\[columns\]\[(.+)\]/);
+    req.body[m[1]][m[2]].records[parseInt(m[3])].columns[m[4]] = fname;
+}
+
+function getFiles (req) {
+    var files = [];
+    for (var key in req.files) {
+        var view = req.files[key];
+        for (var key in view) {
+            var table = view[key];
+            if (!table.records) continue;
+            for (var i=0; i < table.records.length; i++) {
+                var record = table.records[i];
+                for (var key in record.columns) {
+                    files.push(record.columns[key]);
+                }
+            }
+        }
+    }
+    return files;
+}
+
+exports.files = function (req, res, next) {
+    var files = getFiles(req),
+        dpath = res.locals._admin.config.app.upload;
+
+    (function loop (index) {
+        if (index == files.length) return next();
+        var file = files[index];
+        processFile(file, dpath, function (err, fname) {
+            if (fname != '') setName(req, file, fname);
+            loop(++index);
+        });
+    }(0));
+}
diff --git a/views/editview.html b/views/editview.html
@@ -15,7 +15,7 @@ <h2>{{view.name}}</h2>
 </div>
 {{/show.error}}
 
-<form class="form-horizontal" action="{{root}}{{view.action}}" method="post" accept-charset="utf-8">
+<form class="form-horizontal" action="{{root}}{{view.action}}" method="post" accept-charset="utf-8" enctype="multipart/form-data">
     {{>view}}
     {{>inline}}
 

diff --git a/views/editview/column.html b/views/editview/column.html
@@ -8,7 +8,7 @@
     {{#control}}
     <!-- data-type-name={{type.name}} data-type-range="{{type.range}}" data-allow-null="{{allowNull}}" data-default-value="{{defaultValue}}" -->
 
-    <div class="{{#text}}col-sm-5 col-md-4 col-lg-3{{/text}}{{#date}}col-sm-5 col-md-4 col-lg-3{{/date}}{{#select}}col-sm-5 col-md-4 col-lg-3{{/select}}{{#textarea}}{{#editor}}col-sm-9 col-md-9 col-lg-10{{/editor}}{{/textarea}}{{#textarea}}{{^editor}}col-sm-7 col-md-6 col-lg-5{{/editor}}{{/textarea}}">
+    <div class="{{#text}}col-sm-5 col-md-4 col-lg-3{{/text}}{{#file}}col-sm-5 col-md-4 col-lg-3{{/file}}{{#date}}col-sm-5 col-md-4 col-lg-3{{/date}}{{#select}}col-sm-5 col-md-4 col-lg-3{{/select}}{{#textarea}}{{#editor}}col-sm-9 col-md-9 col-lg-10{{/editor}}{{/textarea}}{{#textarea}}{{^editor}}col-sm-7 col-md-6 col-lg-5{{/editor}}{{/textarea}}">
 
     {{#text}}
     <input type="text" name="{{key}}" value="{{value}}" class="form-control" />
@@ -32,6 +32,10 @@
     <input type="text" name="{{key}}" value="{{value}}" class="datepicker form-control" autocomplete="off" />
     {{/date}}
 
+    {{#file}}
+    <input type="text" name="{{key}}" value="{{value}}" class="form-control" />
+    {{/file}}
+
     {{#error}}
     <strong class="help-block" data-error="{{type}}">{{message}}</strong>
     {{/error}}
@@ -46,6 +50,11 @@
         <a href="#" class="btn-today">{{string.today}}</a>
     </div>
     {{/date}}
+    {{#file}}
+    <div class="col-sm-4 col-md-4 col-lg-4">
+        <input type="file" name="{{key}}" value="{{value}}" />
+    </div>
+    {{/file}}
 
     {{/control}}
         </div>

diff --git a/views/listview.html b/views/listview.html
@@ -1,7 +1,7 @@
 
 <h2>
     {{string.select}} {{view.name}} {{string.to-change}}.
-    <a href="{{view.slug}}/add" class="btn btn-default">{{string.add}} {{view.name}}</a>
+    <a href="{{root}}/{{view.slug}}/add" class="btn btn-default">{{string.add}} {{view.name}}</a>
 </h2>
 
 {{#show.success}}
@@ -30,7 +30,7 @@ <h2>
     {{#records}}
         <tr>
         {{#pk}}
-            <td><a href="/{{view.slug}}/{{id}}">{{text}}</a></td>
+            <td><a href="{{root}}/{{view.slug}}/{{id}}">{{text}}</a></td>
         {{/pk}}
         {{#values}}
             <td>{{.}}</td>

diff --git a/views/pagination.html b/views/pagination.html
@@ -4,27 +4,27 @@
     {{#pagination}}
 
         {{#first}}
-        <li><a href="/{{view.slug}}">«</a></li>
+        <li><a href="{{root}}/{{view.slug}}">«</a></li>
         {{/first}}
 
         {{#prev}}
-        <li><a href="/{{view.slug}}/?p={{index}}">‹</a></li>
+        <li><a href="{{root}}/{{view.slug}}/?p={{index}}">‹</a></li>
         {{/prev}}
 
         {{#page}}
-        <li><a href="/{{view.slug}}/?p={{index}}">{{index}}</a></li>
+        <li><a href="{{root}}/{{view.slug}}/?p={{index}}">{{index}}</a></li>
         {{/page}}
 
         {{#active}}
         <li class="active"><a href="">{{index}}</a></li>
         {{/active}}
 
         {{#next}}
-        <li><a href="/{{view.slug}}/?p={{index}}">›</a></li>
+        <li><a href="{{root}}/{{view.slug}}/?p={{index}}">›</a></li>
         {{/next}}
 
         {{#last}}
-        <li><a href="/{{view.slug}}/?p={{index}}">»</a></li>
+        <li><a href="{{root}}/{{view.slug}}/?p={{index}}">»</a></li>
         {{/last}}
 
     {{/pagination}}