diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e9d5f420390ccebf191085a16115ded451b4f5f..dd9f452faf2cdd522abed1149d7181389bf1e1f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Renamed the person reference resolver.
+
### Deprecated
### Removed
diff --git a/build.properties.d/00_default.properties b/build.properties.d/00_default.properties
index 60616622c34259e572f3c1f984574972595e9316..cd57b632e2ea2b9ab005c7185a309a9594f123ff 100644
--- a/build.properties.d/00_default.properties
+++ b/build.properties.d/00_default.properties
@@ -59,7 +59,7 @@ BUILD_MODULE_USER_MANAGEMENT=ENABLED
BUILD_MODULE_USER_MANAGEMENT_CHANGE_OWN_PASSWORD_REALM=CaosDB
BUILD_MODULE_EXT_RESOLVE_REFERENCES=ENABLED
-BUILD_EXT_REFERENCES_CUSTOM_RESOLVER=person_reference
+BUILD_EXT_REFERENCES_CUSTOM_RESOLVER=caosdb_default_person_reference
BUILD_MODULE_EXT_EDITMODE_WYSIWYG_TEXT=DISABLED
@@ -178,4 +178,5 @@ MODULE_DEPENDENCIES=(
form_panel.js
ckeditor.js
ext_editmode_wysiwyg_text.js
+ reference_resolver/caosdb_default_person.js
)
diff --git a/src/core/js/ext_references.js b/src/core/js/ext_references.js
index fe4d618c752490400e501116470cce0f28a909ad..cabf5741c2aab2ac7a9ca2d0d4c363f8a3530341 100644
--- a/src/core/js/ext_references.js
+++ b/src/core/js/ext_references.js
@@ -311,8 +311,8 @@ var resolve_references = new function () {
* resolved as a string and returns a `reference_info` object with
* the resolved custom reference as a `text` property.
*
- * See caosdb-webui/src/ext/js/person_reference_resolver.js for an
- * example.
+ * See caosdb-webui/src/core/js/reference_resolver/caosdb_default_person.js
+ * for an example.
*
* TODO refactor to be configurable. @async @param {string} id - the id of
* the entity which is to be resolved. @return {reference_info}
diff --git a/src/ext/js/person_reference_resover.js b/src/core/js/reference_resolver/caosdb_default_person.js
similarity index 63%
rename from src/ext/js/person_reference_resover.js
rename to src/core/js/reference_resolver/caosdb_default_person.js
index 393557354904787f04472585bca0883d64200d86..24f098c81d1c3f2c1f6dac6e9f6fe7d5b72f5667 100644
--- a/src/ext/js/person_reference_resover.js
+++ b/src/core/js/reference_resolver/caosdb_default_person.js
@@ -22,7 +22,7 @@
*/
/**
- * @module person_reference
+ * @module caosdb_default_person_reference
*
* Replace the reference to a Person Record by the values of that
* Record's firstname and lastname properties.
@@ -30,9 +30,9 @@
* TODO: Make name(s) of person RecordType(s) and names of firstname
* and lastname properties configurable.
*/
-var person_reference = new function () {
+var caosdb_default_person_reference = new function () {
- var logger = log.getLogger("person_reference");
+ var logger = log.getLogger("caosdb_default_person_reference");
const lastname_prop_name = "lastname"
const firstname_prop_name = "firstname"
@@ -42,24 +42,26 @@ var person_reference = new function () {
* Return the name of a person as firstname + lastname
*/
this.get_person_str = function (el) {
- var valpr = getProperties(el);
- if (valpr == undefined) {
- return;
- }
- return valpr.filter(valprel =>
- valprel.name.toLowerCase().trim() ==
- firstname_prop_name.toLowerCase())[0].value +
- " " +
- valpr.filter(valprel => valprel.name.toLowerCase().trim() ==
- lastname_prop_name.toLowerCase())[0].value;
+ var valpr = getProperties(el);
+ if (valpr == undefined) {
+ return;
+ }
+ return valpr.filter(valprel =>
+ valprel.name.toLowerCase().trim() ==
+ firstname_prop_name.toLowerCase())[0].value +
+ " " +
+ valpr.filter(valprel => valprel.name.toLowerCase().trim() ==
+ lastname_prop_name.toLowerCase())[0].value;
}
this.resolve = async function (id) {
- const entity = (await resolve_references.retrieve(id))[0];
+ const entity = (await resolve_references.retrieve(id))[0];
- if (resolve_references.is_child(entity, person_rt_name)) {
- return {"text": person_reference.get_person_str(entity)};
- }
+ if (resolve_references.is_child(entity, person_rt_name)) {
+ return {
+ "text": caosdb_default_person_reference.get_person_str(entity)
+ };
+ }
}
}
diff --git a/src/doc/extension/references.rst b/src/doc/extension/references.rst
index 63c551612e5e9d807846595b6c5e458bc5096615..c41d907de57b658194e062abcd734b41ef88ab9b 100644
--- a/src/doc/extension/references.rst
+++ b/src/doc/extension/references.rst
@@ -23,16 +23,15 @@ the basic structure of the module should look like
// Has to be called ``resolve`` and has to take exactly one
// string parameter: the id of the referenced entity.
this.resolve = async function (id) {
- /*
- * find the string that the reference should be resolved to,
- * e.g., from the value of the entity's properties.
- */
- return {"text": new_reference_text}
+ /*
+ * find the string that the reference should be resolved to,
+ * e.g., from the value of the entity's properties.
+ */
+ return {"text": new_reference_text}
}
}
An example is located in
-``caosdb-webui/src/ext/js/person_reference_resolver.js``. It resolves
-any reference to a ``Person`` Record to the value of its ``firstname``
-and ``lastname`` properties separated by a space and is active by
-default.
+``caosdb-webui/src/core/js/reference_resolver/caosdb_default_person.js``. It
+resolves any reference to a ``Person`` Record to the value of its ``firstname``
+and ``lastname`` properties separated by a space and is active by default.
diff --git a/test/core/js/modules/ext_references.js.js b/test/core/js/modules/ext_references.js.js
index 54e06d33d5f1c33781efe11802a7fbfc5ba44d89..905b90674c6fdbeb683e42900960d646a0d0a315 100644
--- a/test/core/js/modules/ext_references.js.js
+++ b/test/core/js/modules/ext_references.js.js
@@ -104,7 +104,7 @@ QUnit.test("is_child", function(assert){
});
QUnit.test("get_person_str", function(assert){
- assert.ok(person_reference.get_person_str);
+ assert.ok(caosdb_default_person_reference.get_person_str);
});
QUnit.test("update_visible_references_without_summary", async function(assert){