jsharmony-cms 1.6.0 → 1.7.3

package/models/Publish_Add_Release.json

@@ -21,7 +21,7 @@
       {"name":"site_id","control":"dropdown","caption":"Site","validate":["Required"],"readonly":true,
         "lov":{"sql":"select site_id code_val, site_name code_txt from {schema}.site where site_sts='ACTIVE' and site_id={schema}.my_current_site_id()"}},
       {"name":"deployment_target_id","control":"dropdown","caption":"Deployment Target","validate":["Required"],
-        "lov":{"parent":"site_id" ,"sql2":"select site_id code_parent, 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={schema}.my_current_site_id() order by site_id,deployment_target_name"}},
+        "lov":{"parent":"site_id" ,"sql2":"select site_id code_parent, deployment_target_id code_val, deployment_target_name code_txt from {schema}.v_my_deployment_target where ((deployment_target_can_publish = 1) or (deployment_target_can_publish_release = 1)) and deployment_target_sts='ACTIVE' and site_id={schema}.my_current_site_id() order by site_id,deployment_target_name"}},
       {"control":"html","value":[
         "<% if(jsh.globalparams.isWebmaster){ %>",
         "<a href='#' onclick='<%=jsh._instance%>.XExt.popupForm(\"{namespace}Site_Tabs\",\"update\",{site_id:<%=jsh._instance%>.globalparams.site_id}); return false;'>Configure Deployment Targets</a>",

package/models/Site_Deployment_Target_Role.json

@@ -11,7 +11,10 @@
       {"control":"subform","caption":"Preview / Editor","target":"Site_Deployment_Target_Role_Editor","bindings":{"deployment_target_id":"deployment_target_id","deployment_target_role_type":"'EDITOR'"},
         "controlstyle":"display:inline-block; margin-right:15px;"
       },
-      {"control":"subform","caption":"Publish","target":"Site_Deployment_Target_Role_Publish","bindings":{"deployment_target_id":"deployment_target_id","deployment_target_role_type":"'PUBLISH'"},
+      {"control":"subform","caption":"Publish (Any Branch)","target":"Site_Deployment_Target_Role_Publish","bindings":{"deployment_target_id":"deployment_target_id","deployment_target_role_type":"'PUBLISH'"},
+        "controlstyle":"display:inline-block;"
+      },
+      {"control":"subform","caption":"Publish Release","target":"Site_Deployment_Target_Role_Publish_Release","bindings":{"deployment_target_id":"deployment_target_id","deployment_target_role_type":"'PUBLISH_RELEASE'"},
         "controlstyle":"display:inline-block;"
       },
     ]

package/models/Site_Deployment_Target_Role_Base.json

@@ -23,4 +23,7 @@
   "Site_Deployment_Target_Role_Publish": {
     "inherits": "Site_Deployment_Target_Role_Base"
   },
+  "Site_Deployment_Target_Role_Publish_Release": {
+    "inherits": "Site_Deployment_Target_Role_Base"
+  },
 }

package/models/sql/_functions.json

@@ -199,6 +199,28 @@
       "\")",
     ]
   },
+  "{schema}.can_publish":{
+    "params": ["BRANCH_ID","DEPLOYMENT_TARGET_ID"],
+    "sql": [
+      "(case when exists(",
+      "  select * from {schema}.v_my_deployment_target where deployment_target_id=%%%DEPLOYMENT_TARGET_ID%%% and (",
+      "    (deployment_target_can_publish=1) or",
+      "    (deployment_target_can_publish_release=1 and exists(select branch_child.branch_id from {schema}.branch branch_child where branch_child.branch_id=%%%BRANCH_ID%%% and branch_child.branch_type='PUBLIC'))",
+      "  )",
+      ") then 1 else 0 end)"
+    ]
+  },
+  "{schema}.could_have_published":{
+    "params": ["BRANCH_ID","DEPLOYMENT_TARGET_ID"],
+    "sql": [
+      "(case when exists(",
+      "  select * from {schema}.v_my_deployment_target where deployment_target_id=%%%DEPLOYMENT_TARGET_ID%%% and (",
+      "    (deployment_target_can_publish=1) or",
+      "    (deployment_target_can_publish_release=1 and exists(select branch_child.branch_id from {schema}.branch branch_child inner join {schema}.branch branch_parent on branch_parent.branch_id = branch_child.branch_parent_id where branch_child.branch_id=%%%BRANCH_ID%%% and branch_parent.branch_type='PUBLIC'))",
+      "  )",
+      ") then 1 else 0 end)"
+    ]
+  },
   "{schema}.insert_token": {
     "params": ["sys_user_token_hash","sys_user_token_ext","sys_user_token_keys"],
     "sql": [

package/models/sql/objects/deployment.json

@@ -4,7 +4,8 @@
     "caption": "Deployment Target Role Type",
     "init_data": [
       { "code_val": "PUBLISH", "code_txt": "Publish", "code_seq": 1 },
-      { "code_val": "EDITOR", "code_txt": "Preview / Editor", "code_seq": 2 }
+      { "code_val": "PUBLISH_RELEASE", "code_txt": "Publish Release", "code_seq": 2 },
+      { "code_val": "EDITOR", "code_txt": "Preview / Editor", "code_seq": 3 }
     ]
   },
 
@@ -153,6 +154,16 @@
               "  when exists(select * from deployment_target_role dtr inner join {schema}.sys_user_site r on r.sys_user_site_access = dtr.sys_role_name and r.sys_user_id = jsharmony.my_sys_user_id() and r.site_id = deployment_target.site_id and dtr.deployment_target_role_type='PUBLISH' and dtr.deployment_target_id = deployment_target.deployment_target_id) then 1",
               "  else 0 end"
             ]
+          },
+          {
+            "name":"deployment_target_can_publish_release", "type": "int", 
+            "sqlselect": [
+              "case ",
+              "  when {schema}.my_user_is_publisher(deployment_target.site_id) = 0 then 0",
+              "  when exists(select * from deployment_target_role dtr inner join jsharmony.sys_user_role r on r.sys_role_name = dtr.sys_role_name and r.sys_user_id = jsharmony.my_sys_user_id() and dtr.deployment_target_role_type='PUBLISH_RELEASE' and dtr.deployment_target_id = deployment_target.deployment_target_id) then 1",
+              "  when exists(select * from deployment_target_role dtr inner join {schema}.sys_user_site r on r.sys_user_site_access = dtr.sys_role_name and r.sys_user_id = jsharmony.my_sys_user_id() and r.site_id = deployment_target.site_id and dtr.deployment_target_role_type='PUBLISH_RELEASE' and dtr.deployment_target_id = deployment_target.deployment_target_id) then 1",
+              "  else 0 end"
+            ]
           }
         ]
       }
@@ -181,7 +192,7 @@
           "deployment_etstmp",
           "deployment_euser",
           "deployment_mtstmp",
-          "deployment_muser"
+          "deployment_muser",
         ]
       },
       "v_my_deployment_target": {
@@ -191,14 +202,14 @@
         "join_type": "inner",
         "join_columns": {
           "deployment.deployment_target_id": "v_my_deployment_target.deployment_target_id",
-          "deployment_target_can_publish": "1"
+          "case when deployment_target_can_publish = 1 then 1 when deployment_target_can_publish_release = 1 then 1 else 0 end": "1"
         }
       }
     },
     "triggers": [
       {"on": ["insert"], "exec": [
           //Verify access
-          "errorif(not exists(select 1 from {schema}.v_my_deployment_target where v_my_deployment_target.deployment_target_id=inserted(deployment_target_id) and deployment_target_can_publish=1),'No access to publish to this deployment target.');",
+          "errorif($ifnull({schema}.can_publish(inserted(branch_id), inserted(deployment_target_id)),0)<>1,'No access to publish to this deployment target.');",
           //Verify non-duplicate tag name
           "errorif(exists(select 1 from {schema}.deployment inner join {schema}.branch on {schema}.branch.branch_id={schema}.deployment.branch_id where deployment_tag=inserted(deployment_tag) and site_id=inserted(site_id)),'Deployment Tag must be unique for the site.');",
           "errorif(exists(select 1 from {schema}.deployment inner join {schema}.deployment_target on {schema}.deployment_target.deployment_target_id={schema}.deployment.deployment_target_id where deployment_tag=inserted(deployment_tag) and site_id=(select site_id from deployment_target where deployment_target_id=inserted(deployment_target_id))),'Deployment Tag must be unique for the site.');",
@@ -218,7 +229,7 @@
       },
       {"on": ["update"], "exec": [
           //Verify access
-          "errorif(not exists(select 1 from {schema}.v_my_deployment_target where v_my_deployment_target.deployment_target_id=(select deployment_target_id from {schema}.deployment where deployment_id = deleted(deployment_id)) and deployment_target_can_publish=1),'No access to cancel to this deployment.');",
+          "errorif($ifnull({schema}.could_have_published((select branch_id from {schema}.deployment where deployment_id = deleted(deployment_id)), (select deployment_target_id from {schema}.deployment where deployment_id = deleted(deployment_id))),0)<>1,'No access to cancel this deployment.');",
           "update {schema}.deployment set deployment_sts = 'CANCEL' where deployment_id = deleted(deployment_id)"
         ]
       }

package/models/sql/scripts/upgrade/1-7-0.01.sql

@@ -0,0 +1,3 @@
+jsharmony.version_increment('jsHarmonyCMS',1,7,0,0);
+update {schema}.code_deployment_target_role_type set code_seq=3 where code_val='EDITOR';
+insert into {schema}.code_deployment_target_role_type(code_val, code_txt, code_seq) values ('PUBLISH_RELEASE','Publish Release',2);

package/package.json

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