jsharmony-cms 1.8.0 → 1.8.3

package/models/_funcs.branch.js

@@ -364,8 +364,10 @@ module.exports = exports = function(module, funcs){
           },
         ], function(err){
           if(err) return Helper.GenError(req, res, -99999, err.toString());
-          //Return success
-          return res.send(JSON.stringify({ _success: 1 }));
+          HelperFS.tryUnlink(zip_file, function(){
+            //Return success
+            return res.send(JSON.stringify({ _success: 1 }));
+          });
         });
       });
     }

package/models/_funcs.deploy.js

@@ -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

@@ -310,7 +310,7 @@ module.exports = exports = function(module, funcs){
 
       if(newURL!=url){
         content = content.substr(0, startofstr) + newURL + content.substr(endofstr + 1);
-        rtagidx = endofstr;
+        rtagidx = endofstr + (newURL.length - url.length);
       }
       rtagidx = content.indexOf(rtag, rtagidx + 1);
     }

package/models/sql/objects/branch.json

@@ -90,7 +90,7 @@
         ]
       },
       { "on": ["validate_update"], "exec": [
-        "errorif(update(branch_name) and exists(select * from {schema}.branch b2 where b2.branch_name=inserted(branch_name) and $ifnull(b2.branch_user_id,0)=$ifnull(inserted(branch_user_id),0) and b2.site_id=inserted(site_id)),'Another revision with the same name already exists');"
+        "errorif(update(branch_name) and exists(select * from {schema}.branch b2 where b2.branch_name=inserted(branch_name) and (b2.branch_id<>inserted(branch_id)) and $ifnull(b2.branch_user_id,0)=$ifnull(inserted(branch_user_id),0) and b2.site_id=inserted(site_id)),'Another revision with the same name already exists');"
         ]
       },
       { "on": ["update", "insert"], "exec": [
@@ -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": [

package/package.json

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