cpee 2.1.132 → 2.1.134

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: 3344a602b3fd2c235c2aa76a1906dd2f136fddcf8f90ea962f96b3ac28460aff
4
- data.tar.gz: 951158f25e2e34466421aceb56539d7cf9627152f413ac7b0512029c2e0072dd
3
+ metadata.gz: f2f1482473563dd3c7aa8f44778a19a4174a78f313dd71f388a21b488954a240
4
+ data.tar.gz: ea6559c23fcce7b39793962deb6b3be5fa132ecf5d6a3bf8fca717f773c47ee4
5
5
  SHA512:
6
- metadata.gz: cc6ec883f44ed404abf2810ae843d9b688d2fd187e5a34fa1a7232efe62ac34a378f4cfff2f2941afae2f5b2e58baae35c388a966fe565ef1f4d5dac695de520
7
- data.tar.gz: 5d7483dcf67e0255c2ba3f4999b6746ad7beaa81b5190345050a12d95d2312d43e1a912839427c2614f154463ebf1e9f823d7f225c0fedb409c86f3d02005e43
6
+ metadata.gz: 1f0d5ff5163f408c01a4a07dc92614d46d4be6344ba4e011d740f283670d36579b7e808b9c903d6b68d65e0f82b0e8751b4a2a8ccb1d837a414bdcb012205316
7
+ data.tar.gz: 5a05b8528bffc316653a74def8708fba90103472cd3e6d97e89565c8e9cfbb5bdec70aabf6560fa97159dc5c8bdb46ee3f4c4b185a37c591ffe9f266bf339863
@@ -432,7 +432,7 @@ function monitor_instance(cin,rep,load,exec) {// {{{
432
432
  $("input[name=instance-url]").val($("body").attr('current-instance'));
433
433
  $("input[name=res-url]").val($("body").attr('current-resources'));
434
434
 
435
- $('#parameters ui-content ui-area > button').attr('disabled','disabled');
435
+ $('#parameters ui-content ui-area > button, ui-tabbed.parameters ui-content ui-area > button').attr('disabled','disabled');
436
436
  $('#dat_details').empty();
437
437
 
438
438
  $('#modifiers > div').remove();
@@ -917,10 +917,10 @@ function monitor_instance_state_change(notification) { //{{{
917
917
  }
918
918
 
919
919
  if (notification != "ready" && notification != "stopped" && notification != "running") {
920
- $('#parameters ui-content ui-area > button').attr('disabled','disabled');
920
+ $('#parameters ui-content ui-area > button, ui-tabbed.parameters ui-content ui-area > button').attr('disabled','disabled');
921
921
  $('#state_any').hide();
922
922
  } else {
923
- $('#parameters ui-content ui-area > button').removeAttr('disabled');
923
+ $('#parameters ui-content ui-area > button, ui-tabbed.parameters ui-content ui-area > button').removeAttr('disabled');
924
924
  $('#state_any').show();
925
925
  }
926
926
 
@@ -43,13 +43,13 @@ $(document).ready(function() {
43
43
  }); //}}}
44
44
 
45
45
  // new entry //{{{
46
- $('#parameters ui-content ui-area > button').click(function(event){
47
- var but = $(document).find('#parameters ui-content ui-area:not(.inactive) > div button.relaxngui_control');
46
+ $('#parameters ui-content ui-area > button, ui-tabbed.parameters ui-content ui-area > button').click(function(event){
47
+ var but = $(document).find('#parameters ui-content ui-area:not(.inactive) > div button.relaxngui_control, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div button.relaxngui_control');
48
48
  but.click();
49
- var inp = $(document).find('#parameters ui-content ui-area:not(.inactive) > div input');
49
+ var inp = $(document).find('#parameters ui-content ui-area:not(.inactive) > div input, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div input');
50
50
  $(inp[inp.length-2]).focus();
51
- var are = $(document).find('#parameters ui-content ui-area:not(.inactive) > div');
52
- var tab = $(document).find('#parameters ui-content ui-area:not(.inactive) > div > div');
51
+ var are = $(document).find('#parameters ui-content ui-area:not(.inactive) > div, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div');
52
+ var tab = $(document).find('#parameters ui-content ui-area:not(.inactive) > div > div, ui-tabbed.parameters ui-content ui-area:not(.inactive) > div > div');
53
53
  are.animate({ scrollTop: tab.height() }, "slow");
54
54
  }); //}}}
55
55
 
data/cockpit/js/ui.js CHANGED
@@ -34,11 +34,15 @@ $(document).ready(function() {
34
34
  success: function(res){
35
35
  var res_def = config_defaults();
36
36
  $("body").attr('current-base',(res['base-url'] || res_def['base-url']).replace("%host",window.location.host));
37
+ $("input[name=base-url]").val($("body").attr('current-base').replace("%host",window.location.host));
37
38
  $("body").attr('current-templates',(res['templates-url'] || res_def['templates-url']).replace("%host",window.location.host));
38
39
  $.each(res, function(key, value){ // just leave it out when it is not configured
39
40
  if (key != 'base-url' && key != 'templates-url') {
40
41
  $("body").attr('current-' + key.replace(/-url$/,''), value.replace("%host",window.location.host));
41
42
  }
43
+ if (key == 'resources-url') {
44
+ $("input[name=res-url]").val($("body").attr('current-resources'));
45
+ }
42
46
  });
43
47
  cockpit();
44
48
  },
@@ -107,10 +107,11 @@
107
107
  </table>
108
108
  </div> <!--}}}-->
109
109
 
110
- <ui-tabbed id="instance">
110
+ <ui-tabbed id="instance" class="parameters">
111
111
  <ui-tabbar>
112
112
  <ui-tab class="switch" ></ui-tab>
113
113
  <ui-tab class="inactive hidden" data-tab="instance" id="tabinstance" >Model</ui-tab>
114
+ <ui-tab class="inactive hidden" data-tab="documents" id="tabdocuments">Documents</ui-tab>
114
115
  <ui-behind ><a style='display:none' target='_blank' id='current-instance'></a><a style='display:none' target='_blank' id='current-instance-properties'>P</a><a style='display:none' target='_blank' id='current-instance-subscriptions'>S</a><a style='display:none' target='_blank' id='current-instance-callbacks'>C</a></ui-behind>
115
116
  <ui-last ><a class="logo" href=".."></a></ui-last>
116
117
  </ui-tabbar>
@@ -151,6 +152,10 @@
151
152
  </div>
152
153
  </div>
153
154
  </ui-area> <!--}}}-->
155
+ <ui-area data-belongs-to-tab="documents" id="areadocuments" class="inactive"> <!--{{{-->
156
+ <button title='add entry'><span>New</span></button>
157
+ <div id="dat_documents"></div>
158
+ </ui-area> <!--}}}-->
154
159
  </ui-content>
155
160
  </ui-tabbed>
156
161
 
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.1.132"
3
+ s.version = "2.1.134"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0-or-later"
6
6
  s.summary = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
22
22
  s.homepage = 'http://cpee.org/'
23
23
 
24
24
  s.add_runtime_dependency 'riddl', '~> 1.0'
25
- s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.149'
25
+ s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.158'
26
26
  s.add_runtime_dependency 'highline', '~> 2.0'
27
27
  s.add_runtime_dependency 'redis', '~> 5.4'
28
28
  s.add_runtime_dependency 'net-ssh', '~> 7.3'
@@ -4,6 +4,7 @@
4
4
  <include href="executionhandler.rng"/>
5
5
  <include href="positions.rng"/>
6
6
  <include href="dataelements.rng"/>
7
+ <include href="documents.rng"/>
7
8
  <include href="endpoints.rng"/>
8
9
  <include href="attributes.rng"/>
9
10
  <include href="description.rng"/>
@@ -386,7 +386,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
386
386
  send = []
387
387
  send.push Riddl::Parameter::Simple::new('code',__code)
388
388
  send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(__struct.data))
389
- send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(__struct.local)) if __struct.local
389
+ send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(__struct.local)) if __struct.local.any?
390
390
  send.push Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(__struct.endpoints))
391
391
  send.push Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(__struct.additional))
392
392
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.132
4
+ version: 2.1.134
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -34,7 +34,7 @@ dependencies:
34
34
  version: '1.99'
35
35
  - - ">="
36
36
  - !ruby/object:Gem::Version
37
- version: 1.99.149
37
+ version: 1.99.158
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
44
44
  version: '1.99'
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 1.99.149
47
+ version: 1.99.158
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: highline
50
50
  requirement: !ruby/object:Gem::Requirement
@@ -1176,13 +1176,9 @@ files:
1176
1176
  - server/resources/states.dot
1177
1177
  - server/resources/states.xml
1178
1178
  - server/resources/topics.xml
1179
- - server/routing/end.pid
1180
1179
  - server/routing/end.rb
1181
- - server/routing/forward-events-00.pid
1182
1180
  - server/routing/forward-events.rb
1183
- - server/routing/forward-votes.pid
1184
1181
  - server/routing/forward-votes.rb
1185
- - server/routing/persist.pid
1186
1182
  - server/routing/persist.rb
1187
1183
  - tools/cpee
1188
1184
  - tools/server/cpee
@@ -1 +0,0 @@
1
- 1227262
@@ -1 +0,0 @@
1
- 1227280
@@ -1 +0,0 @@
1
- 1227274
@@ -1 +0,0 @@
1
- 1227268