jsharmony-cms 1.9.4 → 1.9.6

package/jsHarmonyCMSSFTPServer.js

@@ -797,154 +797,172 @@ jsHarmonyCMSSFTPServer.prototype.Run = function(run_cb){
 
 
           }).on('READDIR', function(reqid, handle) {
-            _this.DebugLog(clientDesc + 'READDIR');
+            _this.DebugLog(clientDesc + 'READDIR '+reqid);
             //.name(reqid, names)  names = array of { filename, longname, attrs }
             //.status(reqid, statusCode, [message])
 
             var handleInfo = getHandleInfo(handle);
             if(!handleInfo) return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.FAILURE, 'Handle not found');
 
-            handleInfo.page++;
+            waitForLock(handleInfo, function(){
+              handleInfo.lock = true;
 
-            if(!handleInfo.syspath){
-              //Root folder
-              if(handleInfo.page > 1){
-                sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.EOF);
-                closeHandle(handle);
+              handleInfo.page++;
+
+              if(!handleInfo.syspath){
+                //Root folder
+                if(handleInfo.page > 1){
+                  handleInfo.lock = false;
+                  sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.EOF);
+                  closeHandle(handle);
+                }
+                else {
+                  var filename = 'sites';
+                  handleInfo.lock = false;
+                  sftpStream.name(reqid, [{
+                    filename: filename,
+                    longname: 'drwxrwxrwx 1 sys sys 4096 '+moment().format('MMM D YYYY')+' ' + filename,
+                    attrs: {
+                      mode: 0777 + fs.constants.S_IFDIR, // eslint-disable-line no-octal
+                      uid: 0,
+                      gid: 0,
+                      size: 4096,
+                      atime: moment().unix(),
+                      mtime: moment().unix(),
+                    }
+                  }]);
+                }
               }
               else {
-                var filename = 'sites';
-                sftpStream.name(reqid, [{
-                  filename: filename,
-                  longname: 'drwxrwxrwx 1 sys sys 4096 '+moment().format('MMM D YYYY')+' ' + filename,
-                  attrs: {
-                    mode: 0777 + fs.constants.S_IFDIR, // eslint-disable-line no-octal
-                    uid: 0,
-                    gid: 0,
-                    size: 4096,
-                    atime: moment().unix(),
-                    mtime: moment().unix(),
+                fs.exists(handleInfo.syspath, function(exists){
+                  if(!exists){
+                    handleInfo.lock = false;
+                    return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.NO_SUCH_FILE);
                   }
-                }]);
-              }
-            }
-            else {
-              fs.exists(handleInfo.syspath, function(exists){
-                if(!exists) return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.NO_SUCH_FILE);
-                fs.readdir(handleInfo.syspath, function(err, files){
-                  if(err) return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.FAILURE, 'Error retrieving directory listing');
-
-                  Helper.execif((handleInfo.path=='/sites'),
-                    function(f){
-                      files = [];
-                      jsh.AppSrv.ExecRecordset(req._DBContext, cms.funcs.replaceSchema("select site_id,site_name from {schema}.v_my_site where site_sts='ACTIVE' order by site_id"), [], { }, function (err, rslt) {
-                        if (err) { jsh.Log.error(err); return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.FAILURE, 'Error retrieving site listing'); }
-
-                        if(rslt && rslt[0]) _.each(rslt[0], function(site){
-                          var filename_short = HelperFS.cleanFileName(site.site_id);
-                          var filename_long = HelperFS.cleanFileName(site.site_id+'_'+site.site_name);
-                          files.push({
-                            filename: filename_short,
-                            longname: 'drwxrwxrwx 0 sys sys 4096 '+moment().format('MMM D YYYY')+' ' + filename_short,
-                            attrs: {
-                              mode: 0777, // eslint-disable-line no-octal
-                              uid: 0,
-                              gid: 0,
-                              size: 4096,
-                              atime: moment().unix(),
-                              mtime: moment().unix(),
-                            }
-                          });
-                          files.push({
-                            filename: filename_long,
-                            longname: 'lrwxrwxrwx 1 sys sys 4096 '+moment().format('MMM D YYYY')+' ' + filename_long,
-                            attrs: {
-                              mode: 0777 + fs.constants.S_IFDIR, // eslint-disable-line no-octal
-                              uid: 0,
-                              gid: 0,
-                              size: 4096,
-                              atime: moment().unix(),
-                              mtime: moment().unix(),
-                            }
+                  fs.readdir(handleInfo.syspath, function(err, files){
+                    if(err){
+                      handleInfo.lock = false;
+                      return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.FAILURE, 'Error retrieving directory listing');
+                    }
+
+                    Helper.execif((handleInfo.path=='/sites'),
+                      function(f){
+                        files = [];
+                        jsh.AppSrv.ExecRecordset(req._DBContext, cms.funcs.replaceSchema("select site_id,site_name from {schema}.v_my_site where site_sts='ACTIVE' order by site_id"), [], { }, function (err, rslt) {
+                          if (err) {
+                            jsh.Log.error(err);
+                            handleInfo.lock = false;
+                            return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.FAILURE, 'Error retrieving site listing');
+                          }
+
+                          if(rslt && rslt[0]) _.each(rslt[0], function(site){
+                            var filename_short = HelperFS.cleanFileName(site.site_id);
+                            var filename_long = HelperFS.cleanFileName(site.site_id+'_'+site.site_name);
+                            files.push({
+                              filename: filename_short,
+                              longname: 'drwxrwxrwx 0 sys sys 4096 '+moment().format('MMM D YYYY')+' ' + filename_short,
+                              attrs: {
+                                mode: 0777, // eslint-disable-line no-octal
+                                uid: 0,
+                                gid: 0,
+                                size: 4096,
+                                atime: moment().unix(),
+                                mtime: moment().unix(),
+                              }
+                            });
+                            files.push({
+                              filename: filename_long,
+                              longname: 'lrwxrwxrwx 1 sys sys 4096 '+moment().format('MMM D YYYY')+' ' + filename_long,
+                              attrs: {
+                                mode: 0777 + fs.constants.S_IFDIR, // eslint-disable-line no-octal
+                                uid: 0,
+                                gid: 0,
+                                size: 4096,
+                                atime: moment().unix(),
+                                mtime: moment().unix(),
+                              }
+                            });
                           });
+                      
+                          return f();
                         });
-                    
-                        return f();
-                      });
-                    },
-                    function(){
-                      var filesPerPage = 1000;
-                      var pageFiles = [];
-                      var dirPage = [];
-                      if((handleInfo.page-1)*filesPerPage >= files.length){
-                        sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.EOF);
-                        closeHandle(handle);
-                      }
-                      else{
-                        for(var i=filesPerPage*(handleInfo.page-1);i<filesPerPage*handleInfo.page&&i<files.length;i++){
-                          var file = files[i];
-                          if(_.isString(file)){
-                            pageFiles.push(file);
-                            dirPage.push({
-                              filename: file,
-                              longname: file,
-                              attrs: {}
-                            });
-                          }
-                          else {
-                            pageFiles.push('');
-                            dirPage.push(file);
-                          }
+                      },
+                      function(){
+                        var filesPerPage = 1000;
+                        var pageFiles = [];
+                        var dirPage = [];
+                        if((handleInfo.page-1)*filesPerPage >= files.length){
+                          handleInfo.lock = false;
+                          sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.EOF);
+                          closeHandle(handle);
                         }
-                        async.eachOfLimit(pageFiles, 50, function(pageFile, idx, file_cb){
-                          if(!pageFile) return file_cb();
-                          fs.stat(fspath.join(handleInfo.syspath, pageFile), function(err, fstat){
-                            if(err) return file_cb();
-
-                            var longname = '';
-                            if(fstat.isDirectory()) longname += 'd';
-                            //else if(fstat.isSymbolicLink()) longname += 'l';
-                            else if(fstat.isFile()) longname += '-';
-                            else{
-                              dirPage[idx] = undefined;
-                              return file_cb();
+                        else{
+                          for(var i=filesPerPage*(handleInfo.page-1);i<filesPerPage*handleInfo.page&&i<files.length;i++){
+                            var file = files[i];
+                            if(_.isString(file)){
+                              pageFiles.push(file);
+                              dirPage.push({
+                                filename: file,
+                                longname: file,
+                                attrs: {}
+                              });
                             }
-                            
-                            longname += 'rwxrwxrwx 0 sys sys '+(longname=='-' ? fstat.size : 4096)+' '+moment(fstat.mtime).format('MMM D YYYY')+' '+pageFile;
-                            dirPage[idx].longname = longname;
-
-                            dirPage[idx].attrs = {
-                              mode: 0777 + (longname[0]=='d' ? fs.constants.S_IFDIR : longname[0]=='l' ? fs.constants.S_IFLNK : fs.constants.S_IFREG), // eslint-disable-line no-octal
-                              uid: 0,
-                              gid: 0,
-                              size: (longname=='-' ? fstat.size : 4096),
-                              atime: Math.floor(fstat.atime/1000),
-                              mtime: Math.floor(fstat.mtime/1000),
-                            };
-
-                            return file_cb();
-                          });
-                        }, function(err){
-                          if(err){
-                            jsh.Log.error(err);
-                            return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.FAILURE, 'Error retrieving directory listing');
-                          }
-                          //Remove undefined entries from dirPage
-                          for(var i=0;i<dirPage.length;i++){
-                            if(typeof dirPage[i]=='undefined'){
-                              dirPage.splice(i, 1);
-                              i--;
+                            else {
+                              pageFiles.push('');
+                              dirPage.push(file);
                             }
                           }
-                          sftpStream.name(reqid, dirPage);
-                        });
+                          async.eachOfLimit(pageFiles, 50, function(pageFile, idx, file_cb){
+                            if(!pageFile) return file_cb();
+                            fs.stat(fspath.join(handleInfo.syspath, pageFile), function(err, fstat){
+                              if(err) return file_cb();
+
+                              var longname = '';
+                              if(fstat.isDirectory()) longname += 'd';
+                              //else if(fstat.isSymbolicLink()) longname += 'l';
+                              else if(fstat.isFile()) longname += '-';
+                              else{
+                                dirPage[idx] = undefined;
+                                return file_cb();
+                              }
+                              
+                              longname += 'rwxrwxrwx 0 sys sys '+(longname=='-' ? fstat.size : 4096)+' '+moment(fstat.mtime).format('MMM D YYYY')+' '+pageFile;
+                              dirPage[idx].longname = longname;
+
+                              dirPage[idx].attrs = {
+                                mode: 0777 + (longname[0]=='d' ? fs.constants.S_IFDIR : longname[0]=='l' ? fs.constants.S_IFLNK : fs.constants.S_IFREG), // eslint-disable-line no-octal
+                                uid: 0,
+                                gid: 0,
+                                size: (longname=='-' ? fstat.size : 4096),
+                                atime: Math.floor(fstat.atime/1000),
+                                mtime: Math.floor(fstat.mtime/1000),
+                              };
+
+                              return file_cb();
+                            });
+                          }, function(err){
+                            if(err){
+                              jsh.Log.error(err);
+                              handleInfo.lock = false;
+                              return sftpStream.status(reqid, ssh2.SFTP_STATUS_CODE.FAILURE, 'Error retrieving directory listing');
+                            }
+                            //Remove undefined entries from dirPage
+                            for(var i=0;i<dirPage.length;i++){
+                              if(typeof dirPage[i]=='undefined'){
+                                dirPage.splice(i, 1);
+                                i--;
+                              }
+                            }
+                            handleInfo.lock = false;
+                            sftpStream.name(reqid, dirPage);
+                          });
+                        }
                       }
-                    }
-                  );
+                    );
+                  });
                 });
-              });
-            }
-
+              }
+            });
 
           }).on('LSTAT', function(reqid, fpath) {
             _this.DebugLog(clientDesc + 'LSTAT '+fpath);

package/models/Publish_Add_Branch.json

@@ -23,7 +23,7 @@
         "<% } %>",
       ]},
       {"name":"branch_desc","control":"label","caption":"Revision","sqlselect":"(select branch_desc from {schema}.v_my_branch_desc where {schema}.v_my_branch_desc.branch_id = {schema}.branch.branch_id)"},
-      {"name":"deployment_date","control":"textbox","caption":"Publish Date", "validate":["Required","IsDate:'YYYY-MM-DD hh:mm A'"],"default":"js:jsh.moment().format('YYYY-MM-DD hh:mm A')","controlstyle":"width:160px;","unbound":true},
+      {"name":"deployment_date","control":"textbox","caption":"Publish Date", "validate":["Required","IsDate:'YYYY-MM-DD hh:mm A'"],"default":"","controlstyle":"width:160px;","unbound":true},
       {"name":"deployment_tag","control":"textbox_L","caption":"Tag", "validate":["Required","MaxLength:256"],"unbound":true},
       {"control":"button","value":"Schedule Deployment","controlstyle": "padding:3px 8px;margin-top:6px;","onclick": "_this.publish();"}
     ]

package/models/Publish_Add_Branch.onroute.js

@@ -0,0 +1,16 @@
+//(routetype, req, res, callback, require, jsh, modelid, params)
+
+var Helper = require('../Helper.js');
+var moment = require('moment');
+
+if(routetype == 'model'){
+  var model = jsh.getModel(req, modelid);
+  if (!Helper.hasModelAction(req, model, 'B')) { Helper.GenError(req, res, -11, 'Invalid Model Access'); return; }
+
+  var resModel = jsh.getModelClone(req, modelid);
+  var deployment_date = jsh.AppSrvClass.prototype.getFieldByName(resModel.fields, 'deployment_date');
+  deployment_date.default = 'js:' + JSON.stringify(moment().format('YYYY-MM-DD hh:mm A'));
+  req.jshlocal.Models[modelid] = resModel;
+  return callback();
+}
+else return callback();

package/models/Publish_Add_Release.json

@@ -29,7 +29,7 @@
       ]},
       {"name":"branch_id","control":"dropdown","caption":"Release","validate":["Required"],"onchange":"_this.branch_id_onchange(obj, newval, undoChange);",
         "lov":{"parent":"site_id" ,"sql2":"select site_id code_parent, branch_id code_val, branch_desc code_txt from {schema}.v_my_branch_desc where branch_type='PUBLIC' and branch_sts='ACTIVE' and site_id={schema}.my_current_site_id() order by site_id,branch_desc"}},
-      {"name":"deployment_date","control":"textbox","caption":"Publish Date", "validate":["Required","IsDate:'YYYY-MM-DD hh:mm A'"],"default":"js:jsh.moment().format('YYYY-MM-DD hh:mm A')","controlstyle":"width:160px;"},
+      {"name":"deployment_date","control":"textbox","caption":"Publish Date", "validate":["Required","IsDate:'YYYY-MM-DD hh:mm A'"],"default":"","controlstyle":"width:160px;"},
       {"name":"deployment_tag","control":"textbox_L","caption":"Tag", "validate":["Required","MaxLength:256"]},
       {"control":"button","value":"Schedule Deployment","controlstyle": "padding:3px 8px;margin-top:6px;","onclick": "_this.publish();"}
     ]

package/models/Publish_Add_Release.onroute.js

@@ -0,0 +1,16 @@
+//(routetype, req, res, callback, require, jsh, modelid, params)
+
+var Helper = require('../Helper.js');
+var moment = require('moment');
+
+if(routetype == 'model'){
+  var model = jsh.getModel(req, modelid);
+  if (!Helper.hasModelAction(req, model, 'B')) { Helper.GenError(req, res, -11, 'Invalid Model Access'); return; }
+
+  var resModel = jsh.getModelClone(req, modelid);
+  var deployment_date = jsh.AppSrvClass.prototype.getFieldByName(resModel.fields, 'deployment_date');
+  deployment_date.default = 'js:' + JSON.stringify(moment().format('YYYY-MM-DD hh:mm A'));
+  req.jshlocal.Models[modelid] = resModel;
+  return callback();
+}
+else return callback();

package/models/Publish_Log.js

@@ -52,12 +52,7 @@ jsh.App[modelid] = new (function(){
 
         var isRunning = false;
         if(deployment_sts=='RUNNING') isRunning = true;
-        else if(deployment_sts=='PENDING'){
-          var deployment_date = jsh.moment(rslt.deployment.deployment_date);
-          if(deployment_date.isValid()){
-            if(deployment_date.toDate() <= (new Date())) isRunning = true;
-          }
-        }
+        else if(deployment_sts=='PENDING') isRunning = true;
 
         //Render Log
         $('#'+xmodel.class+'_deployment_log').html(XExt.escapeHTMLBR(rslt.log));

package/models/Publish_Redeploy.json

@@ -16,8 +16,8 @@
       {"name":"branch_desc","control":"label","caption":"Revision","sqlselect":"(select branch_desc from {schema}.v_my_branch_desc where branch_id={schema}.v_my_deployment.branch_id)"},
       {"name":"deployment_target_id","control":"dropdown","caption":"Deployment Target","validate":["Required"],"unbound":true,
         "lov":{"sql":"select deployment_target_id code_val, deployment_target_name code_txt from {schema}.v_my_deployment_target where deployment_target_can_publish = 1 and deployment_target_sts='ACTIVE' and site_id in (select site_id from {schema}.deployment inner join {schema}.branch on branch.branch_id = deployment.branch_id where deployment_id=@deployment_id) order by deployment_target_name"}},
-      {"name":"deployment_date","control":"textbox","caption":"Schedule Redeployment", "validate":["Required","IsDate:'YYYY-MM-DD hh:mm A'"],"default":"js:jsh.moment().format('YYYY-MM-DD hh:mm A')","controlstyle":"width:160px;","unbound":true},
-      {"name":"deployment_tag","control":"textbox_L","caption":"Tag", "validate":["Required","MaxLength:256"],"unbound":true,"default":"js:jsh.moment().format('YYYY-MM-DD hh:mm A')+' Redeployment'"},
+      {"name":"deployment_date","control":"textbox","caption":"Schedule Redeployment", "validate":["Required","IsDate:'YYYY-MM-DD hh:mm A'"],"default":"","controlstyle":"width:160px;","unbound":true},
+      {"name":"deployment_tag","control":"textbox_L","caption":"Tag", "validate":["Required","MaxLength:256"],"unbound":true,"default":""},
       {"control":"button","value":"Schedule Redeployment","controlstyle": "padding:3px 8px;margin-top:6px;","onclick": "_this.publish();"}
     ]
   },

package/models/Publish_Redeploy.onroute.js

@@ -0,0 +1,21 @@
+//(routetype, req, res, callback, require, jsh, modelid, params)
+
+var Helper = require('../Helper.js');
+var moment = require('moment');
+
+if(routetype == 'model'){
+  var model = jsh.getModel(req, modelid);
+  if (!Helper.hasModelAction(req, model, 'B')) { Helper.GenError(req, res, -11, 'Invalid Model Access'); return; }
+
+  var resModel = jsh.getModelClone(req, modelid);
+
+  var deployment_date = jsh.AppSrvClass.prototype.getFieldByName(resModel.fields, 'deployment_date');
+  deployment_date.default = 'js:' + JSON.stringify(moment().format('YYYY-MM-DD hh:mm A'));
+
+  var deployment_tag = jsh.AppSrvClass.prototype.getFieldByName(resModel.fields, 'deployment_tag');
+  deployment_tag.default = 'js:' + JSON.stringify(moment().format('YYYY-MM-DD hh:mm A')+' Redeployment');
+
+  req.jshlocal.Models[modelid] = resModel;
+  return callback();
+}
+else return callback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony-cms",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "jsHarmony CMS",
   "main": "index.js",
   "scripts": {