cpee-worklist 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a77a7170f2fcd46b9770c423d9f71534c3326f7815beced68e65689fb38ca72
-  data.tar.gz: d6b1be26ea13097cca31f6feba56e289fe48742f7c51b9dc34bbea3e19b52bff
+  metadata.gz: 2f5e998b250f45900c42856943ea0ed77674b3dc1aca8a639b9292edb56c5270
+  data.tar.gz: '060494d5269eab17272165105056c81e93b875fe0722bc3a9a91a8edf488b342'
 SHA512:
-  metadata.gz: 5d74ffbefc2a1258ffc95af5cdd47764390cf05eae5779598a19cc3aa4bc9062c3d0e02b808d0c868974550e35e3394898375e9e95c4180e84fb5bbd08270c82
-  data.tar.gz: 0d89ba884cd33219f7305bc13c4b13750648bca47c274c71d83987b155db33eb7e502f6844b89cc3d49caa4e1f9dfdfaa8f48b5604dbaecea339080a3d21f5b5
+  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.8"
+  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/lib/cpee-worklist/implementation.rb

@@ -261,7 +261,8 @@ module CPEE
           Riddl::Client.new(@a[0].activities[index]['url']).put [
             Riddl::Header.new('CPEE-UPDATE','true'),
             Riddl::Header.new('CPEE-STATUS','take'),
-            Riddl::Header.new('CPEE-EVENT','take')
+            Riddl::Header.new('CPEE-EVENT','take'),
+            Riddl::Parameter::Simple.new('user',@r[-3])
           ]
         else
           @status = 404
@@ -282,7 +283,8 @@ module CPEE
           Riddl::Client.new(@a[0].activities[index]['url']).put [
             Riddl::Header.new('CPEE-UPDATE','true'),
             Riddl::Header.new('CPEE-STATUS','giveback'),
-            Riddl::Header.new('CPEE-EVENT','giveback')
+            Riddl::Header.new('CPEE-EVENT','giveback'),
+            Riddl::Parameter::Simple.new('user',@r[-3])
           ]
         else
           @status = 404
@@ -322,7 +324,8 @@ module CPEE
           Riddl::Client.new(@a[0].activities[index]['url']).put [
             Riddl::Header.new('CPEE-UPDATE','true'),
             Riddl::Header.new('CPEE-STATUS','take'),
-            Riddl::Header.new('CPEE-EVENT','take')
+            Riddl::Header.new('CPEE-EVENT','take'),
+            Riddl::Parameter::Simple.new('user',@p[0].value)
           ]
         else
           @status = 404

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.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl