Skip to content

Q
qaHome
Commit dd3ecf9c authored by 智勇's avatar 智勇
Browse files
Options

update

parent 32dd4fc5
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
app/qa-home/controller/docker/server_v2.js
View file @ dd3ecf9c
...@@ -675,21 +675,22 @@ function str2Object(str, def) { ...@@ -675,21 +675,22 @@ function str2Object(str, def) {
items.sort() items.sort()
for (let i of items) { // for (let i of items) {
if (def == 1) { // if (def == 1) {
item.push({ // item.push({
label: i, // label: i,
select: false // select: false
}); // });
} else { // } else {
item2[i] = true // item2[i] = true
} // }
} // }
if (def == 1) { // if (def == 1) {
return item // return item
} else { // } else {
return item2 // return item2
} // }
return items
} }
exports.get_systems_by_type = async function () { exports.get_systems_by_type = async function () {
......
app/qa-home/controller/testdata/server.js
View file @ dd3ecf9c
...@@ -459,7 +459,7 @@ exports.createID = async function () { ...@@ -459,7 +459,7 @@ exports.createID = async function () {
do { do {
java_info = await requestPromise(new get_person_from_acs()) java_info = await requestPromise(new get_person_from_acs())
} }
while (typeof java_info !== 'string') while (typeof java_info !== 'string' || java_info.indexOf('html') !== -1)
try { try {
java_info = JSON.parse(java_info) java_info = JSON.parse(java_info)
} catch (error) { } catch (error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment