cpee-worklist 1.0.9 → 1.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5107cbb0d04bd9f6c9e594848eb1c31753764f94bbe4ca3b98d1be239061a138
4
- data.tar.gz: 060e527f606c626231b42ee5e5f43c8c06e6b5f9dcad787b27a52d662b9cf2a7
3
+ metadata.gz: 2f5e998b250f45900c42856943ea0ed77674b3dc1aca8a639b9292edb56c5270
4
+ data.tar.gz: '060494d5269eab17272165105056c81e93b875fe0722bc3a9a91a8edf488b342'
5
5
  SHA512:
6
- metadata.gz: 3b64c541cc55f92c99c700462387236d1a7bb29b1b0b71cc82397bdd08626b1908ab8dfa354ef1beba3a806759f29b039e1f535321ced4041635c3f9bb45f99e
7
- data.tar.gz: acbaf61bdd25be56ff03fdd804b97a99de4c8dc1ef4a516dd73b0f3d1fc2d64fb9ee5ae4d327ac1f0fc6728c89c1b18184017c9ef31f2b0648e837d5b1f950ea
6
+ metadata.gz: 4774db8305dac31b524e7a9b4256bc40ca0c39d0b599e8989ee8502cd2de6f20a07d60929774643727e5492dd393155bc876760b10990cad0e4bc89e3c511e34
7
+ data.tar.gz: 118656ce46e5859ed72efd10648986afeb5ad5cfc359a74dc1317bc6db059505ad928439769c964404361870ad9abf1bd197122ad61317e5e619fc62eb77a561
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee-worklist"
3
- s.version = "1.0.9"
3
+ s.version = "1.0.10"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0-or-later"
6
6
  s.summary = "Worklist for the cloud process execution engine (cpee.org)"
data/ui/js/worklist.js CHANGED
@@ -159,19 +159,27 @@ function do_work(taskid,taskidurl) { //{{{
159
159
  url: res.form,
160
160
  dataType: 'text',
161
161
  success: async (iform) => {
162
- let end = false;
162
+ let end = false;;
163
163
  let evaltext = '';
164
+ let rel = res.form.match(/.*\//)[0];
165
+
164
166
  while (!end) {
165
167
  let matches = iform.match(/<worklist-form-load>(.*?)<\/worklist-form-load>/ms);
166
168
  if (matches && matches.length > 0) {
167
169
  evaltext += matches[1];
168
170
  iform = iform.replace(matches[0],'');
169
171
  } else {
170
- let includes = iform.match(/<\/?worklist-include\s+href=(("([^"]*)")|('([^']*)'))\s*\/?\s*>/ms);
172
+ let includes = iform.match(/<\/?worklist-(relative-)?include\s+href=(("([^"]*)")|('([^']*)'))\s*\/?\s*>/ms);
171
173
  if (includes && includes.length > 0) {
174
+ let inc;
175
+ if (includes[1]) {
176
+ inc = rel + includes[4];
177
+ } else {
178
+ inc = includes[4];
179
+ }
172
180
  await $.ajax({
173
181
  type: "GET",
174
- url: includes[3],
182
+ url: inc,
175
183
  dataType: 'text',
176
184
  success: function(inctext) {
177
185
  iform = iform.replace(includes[0],inctext);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee-worklist
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.9
4
+ version: 1.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: tools
12
12
  cert_chain: []
13
- date: 2024-07-12 00:00:00.000000000 Z
13
+ date: 2024-07-14 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: riddl