jsharmony-cms 1.7.2 → 1.8.1

package/jsHarmonyCMS.js

@@ -37,7 +37,10 @@ var jsHarmonyCMSTransform = require('./jsHarmonyCMSTransform.js');
 
 function jsHarmonyCMS(name, options){
   options = _.extend({
-    schema: 'cms'
+    schema: 'cms',
+    factory: null,
+    createRoles: true,
+    isSubmodule: false,
   }, options);
 
   var _this = this;
@@ -47,6 +50,9 @@ function jsHarmonyCMS(name, options){
   _this.basepath = path.dirname(module.filename);
   _this.schema = options.schema;
 
+  _this.createRoles = options.createRoles;
+  _this.isSubmodule = options.isSubmodule;
+
   _this.SystemPageTemplates = {};
   _this.SystemComponentTemplates = {};
   _this.SystemSiteConfig = {};
@@ -61,6 +67,8 @@ function jsHarmonyCMS(name, options){
 
   _this.funcs = new funcs(_this);
   _this.transform = new jsHarmonyCMSTransform(_this);
+
+  _this._factoryOptions = options.factory;
 }
 
 jsHarmonyCMS.prototype = new jsHarmonyModule();
@@ -68,7 +76,7 @@ jsHarmonyCMS.prototype = new jsHarmonyModule();
 jsHarmonyCMS.prototype.Application = function(){
   var _this = this;
   var jsh = new jsHarmony();
-  var factory = new jsHarmonyFactory();
+  var factory = new jsHarmonyFactory(null, _this._factoryOptions);
   jsh.AddModule(factory);
   jsh.AddModule(this);
   jsh.Sites[factory.mainSiteID] = _.extend(this.getFactoryConfig(),jsh.Sites[factory.mainSiteID]);
@@ -89,7 +97,7 @@ jsHarmonyCMS.prototype.Application = function(){
   return jsh;
 };
 
-jsHarmonyCMS.Application = function(){ return (new jsHarmonyCMS()).Application(); };
+jsHarmonyCMS.Application = function(options){ return (new jsHarmonyCMS(null, options)).Application(); };
 
 jsHarmonyCMS.prototype.Init = function(cb){
   var _this = this;

package/jsHarmonyCMSSFTPServer.js

@@ -896,7 +896,7 @@ jsHarmonyCMSSFTPServer.prototype.Run = function(run_cb){
                             dirPage.push(file);
                           }
                         }
-                        async.eachOf(pageFiles, function(pageFile, idx, file_cb){
+                        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();

package/jsHarmonyCMSTransform.js

@@ -22,6 +22,13 @@ var jsHarmonyModuleTransform = require('jsharmony/jsHarmonyModuleTransform');
 function jsHarmonyCMSTransform(module){
   this.sql = {
     '{deployment_env}': 'default',
+    '{create_sys_roles}': (module.createRoles ? '1' : '0'),
+    '{is_submodule}': (module.isSubmodule ? '1' : '0'),
+  };
+
+  this.ignore_errors = {
+    '0': true,
+    '1': true,
   };
 
   jsHarmonyModuleTransform.call(this, module);

package/models/Admin_SysUser.json

@@ -1,4 +1,5 @@
 {
+    //:if:{create_sys_roles}:
   "/jsHarmonyFactory/Admin/SysUser": {
     "inherits":"/jsHarmonyFactory/Admin/SysUser",
     "fields": [
@@ -26,6 +27,7 @@
       },
     ],
   },
+  //:endif:
   "SysUser_Site": {
     "layout":"grid",
     "table":"{schema}.v_sys_user_site_access",

package/models/Publish_Add.onroute.js

@@ -1,6 +1,7 @@
 //(routetype, req, res, callback, require, jsh, modelid, params)
 
 var Helper = require('../Helper.js');
+var querystring = require('querystring');
 
 var model = jsh.getModelClone(req, modelid);
 
@@ -16,5 +17,8 @@ jsh.AppSrv.ExecRecordset(req._DBContext, 'select (select {schema}.my_current_bra
   if(!rslt[0][0].branch_id){
     return res.end('***JSHARMONY_REDIRECT***\n'+req.baseurl+model.namespace+'Publish_Add_Release');
   }
+  else if(req.query.target=='branch'){
+    return res.end('***JSHARMONY_REDIRECT***\n'+req.baseurl+model.namespace+'Publish_Add_Branch?'+querystring.stringify({ action: 'update', branch_id: rslt[0][0].branch_id }));
+  }
   else return callback();
 });

package/models/_funcs.deploy.js

@@ -1030,7 +1030,7 @@ module.exports = exports = function(module, funcs){
                       async.waterfall([
                         //Perform file delete operations
                         function(file_cb){
-                          async.eachOf(branchData.fsOps.deletedFilesUpper, function(fpath, fpathUpper, delete_cb){
+                          async.eachOfLimit(branchData.fsOps.deletedFilesUpper, 50, function(fpath, fpathUpper, delete_cb){
                             if(!(fpath in branchData.site_files)) return delete_cb(new Error('Could not delete "' + fpath + '" - file not found in site_files'));
                             delete branchData.site_files[fpath];
                             fpath = path.join(publish_params.publish_path, fpath);
@@ -1040,7 +1040,7 @@ module.exports = exports = function(module, funcs){
                 
                         //Perform file add operations
                         function(file_cb){
-                          async.eachOf(branchData.fsOps.addedFiles, function(fcontent, fpath, add_cb){
+                          async.eachOfLimit(branchData.fsOps.addedFiles, 50, function(fcontent, fpath, add_cb){
                             branchData.site_files[fpath] = {
                               md5: crypto.createHash('md5').update(fcontent).digest('hex')
                             };
@@ -2026,6 +2026,7 @@ module.exports = exports = function(module, funcs){
   };
 
   exports.deploy_fs = function(deployment, publish_path, deploy_path, site_files, cb){
+    var jsh = module.jsh;
     var deployment_id = deployment.deployment_id;
     var deployment_target_publish_path = (deployment.deployment_target_publish_path||'').toString();
 
@@ -2044,6 +2045,8 @@ module.exports = exports = function(module, funcs){
       }
     }
 
+    if(!path.isAbsolute(deploy_path)) deploy_path = path.join(jsh.Config.datadir, deploy_path);
+
     var found_files = {};
     var found_folders = {};
 

package/models/_funcs.page.js

@@ -1028,7 +1028,7 @@ module.exports = exports = function(module, funcs){
               //Read URL and querystring
               var parsedUrl = null;
               try{
-                parsedUrl = new urlparser.URL(url);
+                parsedUrl = new urlparser.URL(url, req.protocol + '://' + req.get('host'));
                 template_variables._ = template_variables.timestamp;
                 if(Q.devMode) template_variables.page_template_location = page_template.location;
                 var changedUrl = false;

package/models/js/site.js

@@ -187,6 +187,8 @@
     jsh.globalparams.site_id = site_id;
     jsh.globalparams.site_name = site_name;
 
+    if({is_submodule}) return; // eslint-disable-line no-undef, no-constant-condition
+
     //Render site dropdown in header
     jsh.$root('.xlogo .xsublogo').html(XExt.renderEJS(jsh.GetEJS('jsHarmonyCMS.SiteSelection')));
     jsh.$root('.xlogo .xsublogo').attr('onclick','return false;').off('click').on('click', function(e){

package/models/sql/objects/branch.json

@@ -380,6 +380,7 @@
   "v_my_branch_access": {
     "type": "view",
     "caption": ["Branch", "Branches"],
+    "dependencies": ["{schema}.v_sys_user_site_access"],
     "tables": {
       "branch": {
         "columns": [

package/models/sql/objects/deployment.json

@@ -127,6 +127,7 @@
   "v_my_deployment_target": {
     "type": "view",
     "caption": ["Deployment Target", "Deployment Targets"],
+    "dependencies": ["{schema}.v_sys_user_site_access"],
     "tables": {
       "deployment_target": {
         "columns": [
@@ -202,7 +203,7 @@
         "join_type": "inner",
         "join_columns": {
           "deployment.deployment_target_id": "v_my_deployment_target.deployment_target_id",
-          "case when deployment_target_can_publish = 1 then 1 else when deployment_target_can_publish_release = 1 then 1 else 0 end": "1"
+          "case when deployment_target_can_publish = 1 then 1 when deployment_target_can_publish_release = 1 then 1 else 0 end": "1"
         }
       }
     },

package/models/sql/objects/system.json

@@ -32,6 +32,7 @@
     ]
   },
 
+  //:if:{create_sys_roles}:
   "jsharmony.sys_role": {
     "init_data": [
       { "sys_role_name": "VIEWER", "sys_role_desc": "All Sites - Viewer", "sys_role_seq": 1 },
@@ -43,6 +44,7 @@
       { "sql": "delete from jsharmony.sys_role where sys_role_name in ('DADMIN','X_B','X_X')" }
     ],
   },
+  //:endif:
 
   "jsharmony.sys_user_role": {
     "type":"table",
@@ -55,11 +57,13 @@
       { "name": "sys_user_role_snotes", "type": "varchar", "length": 255 },
     ],
     "init_data": [
+      //:if:{create_sys_roles}:
       { "sys_user_id": 1, "sys_role_name": "VIEWER" },
       { "sys_user_id": 1, "sys_role_name": "AUTHOR" },
       { "sys_user_id": 1, "sys_role_name": "PUBLISHER" },
       { "sys_user_id": 1, "sys_role_name": "WEBMASTER" },
       { "sys_user_id": 1, "sys_role_name": "CMSHOST" }
+      //:endif:
     ],
     "triggers": [
       { "prefix": "{schema}_", "on": ["update"], "exec": [
@@ -94,6 +98,8 @@
       }
     ],
   },
+  
+  //:if:{is_submodule}::else:
 
   "jsharmony.txt": {
     "init_data": [
@@ -177,4 +183,6 @@
       { "help_target_code": "*", "help_title": "jsHarmony CMS", "help_text": "<p><span style=\"font-size:16px\">Explore the full jsHarmony CMS Reference at <a href=\"https://www.jsharmonycms.com/resources/\" target=\"_blank\">jsHarmonyCMS.com</a>, including:</span></p><table border=\"0\" cellpadding=\"7\" cellspacing=\"1\"><tbody><tr><td><span style=\"font-size:16px\">:: Getting Started Video Tutorials</span></td></tr><tr><td><span style=\"font-size:16px\">:: Starter Templates</span></td></tr><tr><td><span style=\"font-size:16px\">:: Documentation</span></td></tr><tr><td><span style=\"font-size:16px\">:: Source Code</span></td></tr></tbody></table>" }
     ]
   }
+  
+  //:endif:
 }

package/package.json

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