Skip to content

Commit f47446d

Browse files
committed
Revert "fix: avoid to retrieve the ip of node when robot cloud provider is used."
This reverts commit 5265164.
1 parent 5265164 commit f47446d

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

source/src/main/resources/log4j2.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ appender.console.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
1616
#logger.file.level = debug
1717
#logger.file.appenderRefs = file
1818
#logger.file.appenderRef.file.ref = LOGFILE
19-
rootLogger.level=debug
19+
rootLogger.level=info
2020
rootLogger.appenderRefs=stdout
2121
rootLogger.appenderRef.stdout.ref=STDOUT

source/src/main/webapp/js/global/global.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2389,13 +2389,10 @@ function bindToggleFullscreen() {
23892389
$(".togglefullscreen").unbind("click").click(function () {
23902390
let idTomove = this.getAttribute('for');
23912391
let myButton = document.getElementById(idTomove);
2392-
console.info(myButton);
23932392
if (myButton.classList.contains("overlay")) {
2394-
console.info("remove");
23952393
myButton.classList.remove('overlay');
23962394
$(document).unbind("keydown");
23972395
} else {
2398-
console.info("add");
23992396
myButton.classList.add('overlay');
24002397

24012398
$(document).bind("keydown", function (e) {

source/src/main/webapp/js/testcase/control.js

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,19 @@ Control.prototype.getJsonData = function () {
5454
Control.prototype.generateContent = function () {
5555
var control = this;
5656
var doc = new Doc();
57+
let uniqfieldid = 'c' + uniqid++;
58+
5759
var row = this.html;
5860
var content = $("<div></div>").addClass("content col-lg-8");
5961
var firstRow = $("<div style='margin-top:15px;margin-left:0px'></div>").addClass("fieldRow row input-group marginBottom10 col-xs-12 col-lg-12");
6062
var secondRow = $("<div></div>").addClass("fieldRow row secondRow input-group col-xs-12 col-lg-12");
6163
var thirdRow = $("<div></div>").addClass("fieldRow row thirdRow input-group");
6264

6365
var picture = $("<div></div>").addClass("col-lg-2").css("height", "100%")
64-
.append($("<div style='margin-top:10px;margin-left:10px;margin-right:10px;max-width: 250px'></div>")
65-
.append($("<img>").attr("id", "ApplicationObjectImg1").css("width", "100%").css("cursor", "pointer"))
66-
.append($("<img>").attr("id", "ApplicationObjectImg2").css("width", "100%").css("margin-top", "10px").css("cursor", "pointer"))
67-
.append($("<img>").attr("id", "ApplicationObjectImg3").css("width", "100%").css("margin-top", "10px").css("cursor", "pointer")));
66+
.append($("<div style='margin-top:10px;margin-left:10px;margin-right:10px;max-width: 250px'></div>")
67+
.append($("<img>").attr("id", "ApplicationObjectImg1").css("width", "100%").css("cursor", "pointer"))
68+
.append($("<img>").attr("id", "ApplicationObjectImg2").css("width", "100%").css("margin-top", "10px").css("cursor", "pointer"))
69+
.append($("<img>").attr("id", "ApplicationObjectImg3").css("width", "100%").css("margin-top", "10px").css("cursor", "pointer")));
6870

6971

7072
var plusBtn = $("<button></button>").addClass("btn add-btn config-btn").attr("data-toggle", "modal").attr("data-target", "#modalOptions").append($("<span></span>").addClass("glyphicon glyphicon-cog"));
@@ -137,7 +139,7 @@ Control.prototype.generateContent = function () {
137139
control.value1 = convertValueWithErratum(control.value1, controlValue1Field.val());
138140
});
139141
var controlField1Container = $("<div class='input-group'></div>");
140-
var controlField1Addon = $("<span></span>").attr("id", "controlField1Addon").addClass("input-group-addon").attr("style", "font-weight: 700;");
142+
var controlField1Addon = $("<span></span>").attr("id", "controlField1Addon").attr('for', uniqfieldid + 'v1').addClass("input-group-addon togglefullscreen").attr("style", "font-weight: 700;");
141143
controlField1Addon.append("<img width='15px' height='15px' src='images/action-website.png'>");
142144
controlValue1Field.attr("aria-describedby", "controlField1Addon");
143145
controlField1Container.append(controlField1Addon).append(controlValue1Field);
@@ -152,7 +154,7 @@ Control.prototype.generateContent = function () {
152154
control.value2 = convertValueWithErratum(control.value2, controlValue2Field.val());
153155
});
154156
var controlField2Container = $("<div class='input-group'></div>");
155-
var controlField2Addon = $("<span></span>").attr("id", "controlField2Addon").addClass("input-group-addon").attr("style", "font-weight: 700;");
157+
var controlField2Addon = $("<span></span>").attr("id", "controlField2Addon").attr('for', uniqfieldid + 'v2').addClass("input-group-addon togglefullscreen").attr("style", "font-weight: 700;");
156158
controlField2Addon.append("<img width='15px' height='15px' src='images/action-website.png'>");
157159
controlValue2Field.attr("aria-describedby", "controlField2Addon");
158160
controlField2Container.append(controlField2Addon).append(controlValue2Field);
@@ -167,18 +169,18 @@ Control.prototype.generateContent = function () {
167169
control.value3 = controlValue3Field.val();
168170
});
169171
var controlField3Container = $("<div class='input-group'></div>");
170-
var controlField3Addon = $("<span></span>").attr("id", "controlField3Addon").addClass("input-group-addon").attr("style", "font-weight: 700;");
172+
var controlField3Addon = $("<span></span>").attr("id", "controlField3Addon").attr('for', uniqfieldid + 'v3').addClass("input-group-addon togglefullscreen").attr("style", "font-weight: 700;");
171173
controlField3Addon.append("<img width='15px' height='15px' src='images/action-website.png'>");
172174
controlValue3Field.attr("aria-describedby", "controlField3Addon");
173175
controlField3Container.append(controlField3Addon).append(controlValue3Field);
174176
//END OF VALUE3 FIELD
175177

176178
firstRow.append(descContainer);
177179
secondRow.append(controlDivContainer);
178-
secondRow.append($("<div></div>").addClass("v1 col-lg-3 form-group marginBottom10").append(controlField1Container));
180+
secondRow.append($("<div></div>").addClass("v1 col-lg-3 form-group marginBottom10").attr('id', uniqfieldid + 'v1').append(controlField1Container));
179181
secondRow.append(controlOperatorDivContainer);
180-
secondRow.append($("<div></div>").addClass("v2 col-lg-3 form-group marginBottom10").append(controlField2Container));
181-
secondRow.append($("<div></div>").addClass("v3 col-lg-3 form-group marginBottom10").append(controlField3Container));
182+
secondRow.append($("<div></div>").addClass("v2 col-lg-3 form-group marginBottom10").attr('id', uniqfieldid + 'v2').append(controlField2Container));
183+
secondRow.append($("<div></div>").addClass("v3 col-lg-3 form-group marginBottom10").attr('id', uniqfieldid + 'v3').append(controlField3Container));
182184

183185

184186
if ((this.parentStep.isUsingLibraryStep) || (!control.hasPermissionsUpdate)) {
@@ -340,8 +342,8 @@ function setPlaceholderControl(control) {
340342

341343
if (typeof placeHolders.field1 !== 'undefined') {
342344
control.find("div[class*='v1']")
343-
.removeClass("col-lg-2 col-lg-3 col-lg-4 col-lg-5 col-lg-6 col-lg-7 col-lg-8 col-lg-9 crb-autocomplete-element crb-autocomplete-property crb-autocomplete-service crb-autocomplete-variable crb-autocomplete-fileuploadflag crb-autocomplete-filesortflag crb-autocomplete-boolean crb-autocomplete-select crb-autocomplete-switch crb-contextual-button")
344-
.addClass(placeHolders.field1.class);
345+
.removeClass("col-lg-2 col-lg-3 col-lg-4 col-lg-5 col-lg-6 col-lg-7 col-lg-8 col-lg-9 crb-autocomplete-element crb-autocomplete-property crb-autocomplete-service crb-autocomplete-variable crb-autocomplete-fileuploadflag crb-autocomplete-filesortflag crb-autocomplete-boolean crb-autocomplete-select crb-autocomplete-switch crb-contextual-button")
346+
.addClass(placeHolders.field1.class);
345347
control.find("div[class*='v1']").show();
346348
control.find("div[class*='v1']").find('input').attr("placeholder", placeHolders.field1.label[user.language]);
347349
control.find("div[class*='v1']").find('#controlField1Addon').attr("data-toggle", "tooltip").attr("data-original-title", placeHolders.field1.label[user.language]);
@@ -354,8 +356,8 @@ function setPlaceholderControl(control) {
354356
}
355357
if (typeof placeHolders.field2 !== 'undefined') {
356358
control.find("div[class*='v2']")
357-
.removeClass("col-lg-2 col-lg-3 col-lg-4 col-lg-5 col-lg-6 col-lg-7 col-lg-8 col-lg-9 crb-autocomplete-element crb-autocomplete-property crb-autocomplete-service crb-autocomplete-variable crb-autocomplete-fileuploadflag crb-autocomplete-filesortflag crb-autocomplete-boolean crb-autocomplete-select crb-autocomplete-switch crb-contextual-button")
358-
.addClass(placeHolders.field2.class);
359+
.removeClass("col-lg-2 col-lg-3 col-lg-4 col-lg-5 col-lg-6 col-lg-7 col-lg-8 col-lg-9 crb-autocomplete-element crb-autocomplete-property crb-autocomplete-service crb-autocomplete-variable crb-autocomplete-fileuploadflag crb-autocomplete-filesortflag crb-autocomplete-boolean crb-autocomplete-select crb-autocomplete-switch crb-contextual-button")
360+
.addClass(placeHolders.field2.class);
359361
control.find("div[class*='v2']").show();
360362
control.find("div[class*='v2']").find('input').attr("placeholder", placeHolders.field2.label[user.language]);
361363
control.find("div[class*='v2']").find('#controlField2Addon').attr("data-toggle", "tooltip").attr("data-original-title", placeHolders.field2.label[user.language]);
@@ -367,8 +369,8 @@ function setPlaceholderControl(control) {
367369
}
368370
if (typeof placeHolders.field3 !== 'undefined') {
369371
control.find("div[class*='v3']")
370-
.removeClass("col-lg-2 col-lg-3 col-lg-4 col-lg-5 col-lg-6 col-lg-7 col-lg-8 col-lg-9 crb-autocomplete-element crb-autocomplete-property crb-autocomplete-service crb-autocomplete-variable crb-autocomplete-fileuploadflag crb-autocomplete-filesortflag crb-autocomplete-boolean crb-autocomplete-select crb-autocomplete-switch crb-contextual-button")
371-
.addClass(placeHolders.field3.class);
372+
.removeClass("col-lg-2 col-lg-3 col-lg-4 col-lg-5 col-lg-6 col-lg-7 col-lg-8 col-lg-9 crb-autocomplete-element crb-autocomplete-property crb-autocomplete-service crb-autocomplete-variable crb-autocomplete-fileuploadflag crb-autocomplete-filesortflag crb-autocomplete-boolean crb-autocomplete-select crb-autocomplete-switch crb-contextual-button")
373+
.addClass(placeHolders.field3.class);
372374
control.find("div[class*='v3']").show();
373375
control.find("div[class*='v3']").find('input').attr("placeholder", placeHolders.field3.label[user.language]);
374376
control.find("div[class*='v3']").find('#controlField3Addon').attr("data-toggle", "tooltip").attr("data-original-title", placeHolders.field3.label[user.language]);

0 commit comments

Comments
 (0)