Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-webui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-webui
Commits
d36c3307
Verified
Commit
d36c3307
authored
5 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
Fix tests
parent
e8b9d0ca
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/js/ext_revisions.js
+11
-7
11 additions, 7 deletions
src/core/js/ext_revisions.js
test/core/js/modules/ext_revisions.js.js
+2
-0
2 additions, 0 deletions
test/core/js/modules/ext_revisions.js.js
with
13 additions
and
7 deletions
src/core/js/ext_revisions.js
+
11
−
7
View file @
d36c3307
...
@@ -75,16 +75,18 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
...
@@ -75,16 +75,18 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
logger
.
debug
(
"
insert obsolete
"
,
id
);
logger
.
debug
(
"
insert obsolete
"
,
id
);
// create new obsolete entity from the original
// create new obsolete entity from the original
var
obsolete
=
await
transaction
.
retrieveEntityById
(
id
);
const
obsolete
=
await
transaction
.
retrieveEntityById
(
id
);
$
(
obsolete
).
attr
(
"
id
"
,
"
-1
"
);
$
(
obsolete
).
attr
(
"
id
"
,
"
-1
"
);
$
(
obsolete
).
find
(
"
Permissions
"
).
remove
();
$
(
obsolete
).
find
(
"
Permissions
"
).
remove
();
$
(
obsolete
).
find
(
"
Parent
"
).
remove
();
$
(
obsolete
).
find
(
"
Parent
"
).
remove
();
$
(
obsolete
).
append
(
`<Parent name="
${
_datamodel
.
obsolete
}
"/>`
);
$
(
obsolete
).
append
(
`<Parent name="
${
_datamodel
.
obsolete
}
"/>`
);
var
doc
=
_createDocument
(
"
Request
"
);
const
doc
=
_createDocument
(
"
Request
"
);
doc
.
firstElementChild
.
appendChild
(
obsolete
);
doc
.
firstElementChild
.
appendChild
(
obsolete
);
var
result
=
await
transaction
.
insertEntitiesXml
(
doc
);
const
result
=
await
transaction
.
insertEntitiesXml
(
doc
);
return
$
(
result
.
firstElementChild
).
find
(
"
[id]
"
).
first
().
attr
(
"
id
"
);
const
obsolete_id
=
$
(
result
.
firstElementChild
).
find
(
"
[id]
"
).
first
().
attr
(
"
id
"
);
logger
.
trace
(
"
leave _insert_obsolete
"
,
obsolete_id
);
return
obsolete_id
;
};
};
/**
/**
...
@@ -98,11 +100,12 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
...
@@ -98,11 +100,12 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
* @returns {string} A HTML represesentation of an entity property.
* @returns {string} A HTML represesentation of an entity property.
*/
*/
var
_make_revision_of_property
=
async
function
(
obsolete_id
)
{
var
_make_revision_of_property
=
async
function
(
obsolete_id
)
{
logger
.
debug
(
"
_make_revision_of_property
"
,
obsolete_id
);
logger
.
trace
(
"
enter
_make_revision_of_property
"
,
obsolete_id
);
var
ret
=
(
await
transformation
.
transformProperty
(
str2xml
(
`<Response><Property id="
${
_datamodel
.
_revisionOfId
}
" name="
${
_datamodel
.
revisionOf
}
" datatype="
${
_datamodel
.
obsolete
}
"></Property></Response>`
))).
firstElementChild
;
const
ret
=
(
await
transformation
.
transformProperty
(
str2xml
(
`<Response><Property id="
${
_datamodel
.
_revisionOfId
}
" name="
${
_datamodel
.
revisionOf
}
" datatype="
${
_datamodel
.
obsolete
}
"></Property></Response>`
))).
firstElementChild
;
$
(
ret
).
append
(
`<div class="caosdb-property-edit-value"><select><option value="
${
obsolete_id
}
" selected="selected"></option></select></div>`
);
$
(
ret
).
find
(
"
.caosdb-f-property-value
"
).
append
(
`<div class="caosdb-property-edit-value"><select><option value="
${
obsolete_id
}
" selected="selected"></option></select></div>`
);
logger
.
trace
(
"
leave _make_revision_of_property
"
,
ret
);
return
ret
;
return
ret
;
}
}
...
@@ -215,6 +218,7 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
...
@@ -215,6 +218,7 @@ var ext_revisions = function ($, logger, edit_mode, getEntityID, transaction, _c
// private members, exposed for testing
// private members, exposed for testing
_make_revision_of_property
:
_make_revision_of_property
,
_make_revision_of_property
:
_make_revision_of_property
,
_datamodel
:
_datamodel
,
_datamodel
:
_datamodel
,
_logger
:
logger
,
}
}
}(
$
,
log
.
getLogger
(
"
ext_revisions
"
),
edit_mode
,
getEntityID
,
transaction
,
_createDocument
);
}(
$
,
log
.
getLogger
(
"
ext_revisions
"
),
edit_mode
,
getEntityID
,
transaction
,
_createDocument
);
...
...
This diff is collapsed.
Click to expand it.
test/core/js/modules/ext_revisions.js.js
+
2
−
0
View file @
d36c3307
...
@@ -33,6 +33,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
...
@@ -33,6 +33,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
this
.
original_insert
=
transaction
.
insertEntitiesXml
;
this
.
original_insert
=
transaction
.
insertEntitiesXml
;
this
.
original_retrieve
=
transaction
.
retrieveEntityById
;
this
.
original_retrieve
=
transaction
.
retrieveEntityById
;
this
.
original_query
=
query
;
this
.
original_query
=
query
;
ext_revisions
.
_logger
.
setLevel
(
"
trace
"
);
},
},
beforeEach
:
function
(
assert
)
{
beforeEach
:
function
(
assert
)
{
// setup before each test
// setup before each test
...
@@ -80,6 +81,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
...
@@ -80,6 +81,7 @@ var ext_revisions_test_suite = function ($, ext_revisions, QUnit, edit_mode) {
assert
.
equal
(
rec
.
id
,
"
-1
"
,
"
insert with tmp id
"
);
assert
.
equal
(
rec
.
id
,
"
-1
"
,
"
insert with tmp id
"
);
assert
.
equal
(
$
(
rec
).
find
(
"
Parent
"
).
attr
(
"
name
"
),
datamodel
.
obsolete
,
"
Obsolete Parent
"
);
assert
.
equal
(
$
(
rec
).
find
(
"
Parent
"
).
attr
(
"
name
"
),
datamodel
.
obsolete
,
"
Obsolete Parent
"
);
xml
.
firstElementChild
.
firstElementChild
.
id
=
"
2345
"
;
xml
.
firstElementChild
.
firstElementChild
.
id
=
"
2345
"
;
console
.
log
(
xml2str
(
xml
));
done
();
done
();
return
xml
;
return
xml
;
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment