cpee-worklist 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5107cbb0d04bd9f6c9e594848eb1c31753764f94bbe4ca3b98d1be239061a138
-  data.tar.gz: 060e527f606c626231b42ee5e5f43c8c06e6b5f9dcad787b27a52d662b9cf2a7
+  metadata.gz: 2f5e998b250f45900c42856943ea0ed77674b3dc1aca8a639b9292edb56c5270
+  data.tar.gz: '060494d5269eab17272165105056c81e93b875fe0722bc3a9a91a8edf488b342'
 SHA512:
-  metadata.gz: 3b64c541cc55f92c99c700462387236d1a7bb29b1b0b71cc82397bdd08626b1908ab8dfa354ef1beba3a806759f29b039e1f535321ced4041635c3f9bb45f99e
-  data.tar.gz: acbaf61bdd25be56ff03fdd804b97a99de4c8dc1ef4a516dd73b0f3d1fc2d64fb9ee5ae4d327ac1f0fc6728c89c1b18184017c9ef31f2b0648e837d5b1f950ea
+  metadata.gz: 4774db8305dac31b524e7a9b4256bc40ca0c39d0b599e8989ee8502cd2de6f20a07d60929774643727e5492dd393155bc876760b10990cad0e4bc89e3c511e34
+  data.tar.gz: 118656ce46e5859ed72efd10648986afeb5ad5cfc359a74dc1317bc6db059505ad928439769c964404361870ad9abf1bd197122ad61317e5e619fc62eb77a561

data/cpee-worklist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-worklist"
-  s.version          = "1.0.9"
+  s.version          = "1.0.10"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Worklist for the cloud process execution engine (cpee.org)"

data/ui/js/worklist.js

@@ -159,19 +159,27 @@ function do_work(taskid,taskidurl) { //{{{
         url: res.form,
         dataType: 'text',
         success: async (iform) => {
-          let end = false;
+          let end = false;;
           let evaltext = '';
+          let rel = res.form.match(/.*\//)[0];
+
           while (!end) {
             let matches = iform.match(/<worklist-form-load>(.*?)<\/worklist-form-load>/ms);
             if (matches && matches.length > 0) {
               evaltext += matches[1];
               iform = iform.replace(matches[0],'');
             } else {
-              let includes = iform.match(/<\/?worklist-include\s+href=(("([^"]*)")|('([^']*)'))\s*\/?\s*>/ms);
+              let includes = iform.match(/<\/?worklist-(relative-)?include\s+href=(("([^"]*)")|('([^']*)'))\s*\/?\s*>/ms);
               if (includes && includes.length > 0) {
+                let inc;
+                if (includes[1]) {
+                  inc = rel + includes[4];
+                } else {
+                  inc = includes[4];
+                }
                 await $.ajax({
                   type: "GET",
-                  url: includes[3],
+                  url: inc,
                   dataType: 'text',
                   success: function(inctext) {
                     iform = iform.replace(includes[0],inctext);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-worklist
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl