jsharmony 1.26.4 → 1.27.0

package/AppSrv.DB.js

@@ -569,7 +569,11 @@ exports.ExecTasks = function (req, res, dbtasks, trans, callback, options) {
     function(dbtrans, callback, transtbl){ ... }
   */
   var _this = this;
-  if (_.isEmpty(dbtasks)) { res.end(JSON.stringify({ '_success': 1, '_stats': {} })); return; }
+  if (_.isEmpty(dbtasks)) {
+    res.type('json');
+    res.end(JSON.stringify({ '_success': 1, '_stats': {} }));
+    return;
+  }
   
   //Split off post-processing
   var posttasks = [];
@@ -608,6 +612,7 @@ exports.ExecTasks = function (req, res, dbtasks, trans, callback, options) {
       posttask(postcallback, rslt);
     }, function (err) {
       if (err != null) { _this.AppDBError(req, res, err); return; }
+      res.type('json');
       res.send(JSON.stringify(rslt));
       if (typeof callback != 'undefined') callback();
     });

package/AppSrv.File.js

@@ -74,7 +74,10 @@ exports.Upload = function (req, res) {
       else {
         rslt = { '_success': 1, 'file_size': file_size, 'file_token': file_token, 'file_orig_name': file_orig_name, 'file_extension': file_ext };
         if (req.jsproxyid) return res.end(Helper.js_proxy(req, rslt));
-        else return res.end(JSON.stringify(rslt));
+        else{
+          res.type('json');
+          return res.end(JSON.stringify(rslt));
+        }
       }
     });
   });
@@ -144,6 +147,7 @@ exports.ClearUpload = function (req, res) {
   if (!('_DBContext' in req) || (req._DBContext == '') || (req._DBContext == null)) { return Helper.GenError(req, res, -30, 'Invalid file upload request.'); }
   var user_folder = jsh.Config.datadir + 'temp/' + req._DBContext + '/';
   HelperFS.clearFiles(user_folder, -1, -1, function (err) {
+    res.type('json');
     res.end(JSON.stringify({ '_success': 1 }));
   });
 };

package/AppSrv.Queue.js

@@ -29,6 +29,7 @@ exports.GetToken = function (req, res) {
   if (!req.jshsite.auth.getToken) { return Helper.GenError(req, res, -99999, 'Token generation not defined'); }
   req.jshsite.auth.getToken(this, req, function (rslt, err) {
     if (err) { return Helper.GenError(req, res, -99999, err); }
+    res.type('json');
     res.end(JSON.stringify(rslt));
   });
 };
@@ -67,7 +68,10 @@ exports.PopQueue = function (req, res, next, queueid) {
   if (!_.isEmpty(verrors)) { return Helper.GenError(req, res, -2, verrors[''].join('\n')); }
   
   if (!Helper.hasModelAction(req, queue, 'D')) { return Helper.GenError(req, res, -11, 'Invalid Access'); }
-  this.JobProc.PopQueue(req, res, queueid, P, function () { res.end(JSON.stringify({ '_success': 1 })); });
+  this.JobProc.PopQueue(req, res, queueid, P, function () {
+    res.type('json');
+    res.end(JSON.stringify({ '_success': 1 }));
+  });
 };
 
 exports.SendQueue = function (queueid, message) {

package/AppSrvModel.js

@@ -117,11 +117,13 @@ AppSrvModel.prototype.GetModel = function (req, res, fullmodelid) {
           helpurl_onclick: '',
           ejs: rslt
         });
+        res.type('json');
         res.end(JSON.stringify(model));
       } });
       return;
     }
     else {
+      res.type('json');
       res.end(JSON.stringify(rslt));
     }
   } });

package/AppSrvRpt.js

@@ -911,6 +911,7 @@ AppSrvRpt.prototype.runReportJob = function (req, res, fullmodelid, Q, P, onComp
         if (err != null) { thisapp.AppDBError(req, res, err, stats); return; }
         else rslt = { '_success': _.size(jobtasks) };
         rslt['_stats'] = Helper.FormatStats(req, stats);
+        res.type('json');
         res.send(JSON.stringify(rslt));
       });
     }

package/clientjs/XExt.XModel.js

@@ -522,7 +522,7 @@ exports = module.exports = function(jsh){
       if (!field) return false;
       var oldval = this[id];
       if ('format' in field) {
-        let oldval_fmt = jsh.XFormat.Apply(field.format, oldval);
+        var oldval_fmt = jsh.XFormat.Apply(field.format, oldval);
         oldval = jsh.XFormat.Decode(field.format, oldval_fmt);
       }
       var newval = this.GetValue(field);

package/clientjs/XExt.js

@@ -1802,7 +1802,7 @@ exports = module.exports = function(jsh){
   };
 
   XExt.Alert = function (obj, onAccept, params) {
-    params = _.extend({ escapeHTML: true }, params);
+    params = _.extend({ escapeHTML: true, style: '' }, params);
     var msg = '';
     if (_.isString(obj)) msg = obj;
     else msg = JSON.stringify(obj);
@@ -1813,6 +1813,8 @@ exports = module.exports = function(jsh){
     //alert(msg);
     jsh.xDialog.unshift('.xalertbox');
     jsh.$dialogBlock('.xalertbox.base').zIndex(jsh.xDialog.length);
+
+    jsh.$dialogBlock('.xalertbox').prop('style', params.style);
     
     var oldactive = document.activeElement;
     if (oldactive) $(oldactive).blur();

package/jsHarmony.LoadModels.js

@@ -949,7 +949,8 @@ exports.ParseEntities = function () {
     }
     var db = modelExt.db = _this.DB[modelDB];
     modelExt.sqlext = db.SQLExt;
-    var tabledef = modelExt.tabledef = db.getTableDefinition(model.table);
+    var moduleSchema = (model.module && _this.Modules[model.module] && _this.Modules[model.module].schema) || '';
+    var tabledef = modelExt.tabledef = db.getTableDefinition(model.table, moduleSchema);
     if(tabledef && tabledef.table_type){
       model._dbdef = {
         table_type: tabledef.table_type ,

package/jsHarmony.LoadSQL.js

@@ -738,7 +738,7 @@ exports.ParseSQLObjects = function(){
           obj.tables = resolvedTables;
 
           //Resolve Dependencies
-          if(obj.dependencies) for(var i=0;i<obj.dependencies.length;i++){
+          if(obj.dependencies) for(let i=0;i<obj.dependencies.length;i++){
             let depName = obj.dependencies[i];
             if(module.schema && ((depName.indexOf('.')<0))){
               obj.dependencies[i] = module.schema + '.' + depName;
@@ -750,7 +750,7 @@ exports.ParseSQLObjects = function(){
             let tbl = obj.tables[tblname];
             let resolvedTable = tbl.table ? tbl.table : tblname;
             obj._tables[resolvedTable] = resolvedTable;
-            if(tbl.columns) for(var i=0;i<tbl.columns.length;i++){
+            if(tbl.columns) for(let i=0;i<tbl.columns.length;i++){
               var col = tbl.columns[i];
               if(_.isString(col)) tbl.columns[i] = col = { name: col };
             }

package/jsHarmonyModule.js

@@ -92,6 +92,9 @@ jsHarmonyModule.prototype.Application = function(){
 };
 jsHarmonyModule.prototype.onModuleAdded = function(){
 };
+jsHarmonyModule.prototype.replaceSchema = function(sql){
+  return Helper.ReplaceAll(sql,'{schema}.', this.schema?this.schema+'.':'');
+};
 
 //Root Application Module
 jsHarmonyModule.ApplicationModule = function(jsh){

package/lib/Helper.js

@@ -139,6 +139,7 @@ exports.GenError = function(req,res,num,txt,options){
   if ('jsproxyid' in req) { res.end(this.js_proxy_raw(req, JSON.stringify(erslt))); return erslt; }
   if ('jsonpcallback' in req.query) { res.end(this.jsonp(req, erslt)); return erslt; }
   res.status(500);
+  res.type('json');
   res.end(JSON.stringify(erslt));
   return erslt;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony",
-  "version": "1.26.4",
+  "version": "1.27.0",
   "description": "Rapid Application Development (RAD) Platform for Node.js Database Application Development",
   "main": "index.js",
   "scripts": {