From 01cb8de4682748e410ec109196bf77058731c23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Mon, 18 Sep 2023 21:01:18 +0200
Subject: [PATCH] FIX: fix urls
---
CHANGELOG.md | 2 +-
README.md | 6 +++---
.../js/reference_resolver/linkahead_default_person.js | 8 ++++----
src/doc/tutorials/edit_mode.rst | 6 +++---
test/core/js/modules/ext_prop_display.js.js | 2 +-
test/core/js/modules/ext_references.js.js | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbdc995d..cb575203 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -116,7 +116,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `query_form` module. Enable/disable via build property
`BUILD_MODULE_LEGACY_QUERY_FORM={ENABLED,DISABLED}`. To be removed when
- linkahead-webui-core-components are included into this webui permanently.
+ caosdb-webui-core-components are included into this webui permanently.
### Fixed
diff --git a/README.md b/README.md
index c06a557c..3fbf2ccb 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ setup this code.
## Further Reading
-Please refer to the [official documentation](https://docs.linkahead.org/linkhead-webui/) for more information.
+Please refer to the [official documentation](https://docs.indiscale.com/linkhead-webui/) for more information.
## Contributing
@@ -32,10 +32,10 @@ By participating, you are expected to uphold our [Code of Conduct](https://gitla
request in GitLab and choose this repository as target. Make sure to select
"Allow commits from members who can merge the target branch" under Contribution
when creating the merge request. This allows our team to work with you on your request.
-- If you have a suggestion for the [documentation](https://docs.linkahead.org/linkhead-webui/),
+- If you have a suggestion for the [documentation](https://docs.indiscale.com/linkhead-webui/),
the preferred way is also a merge request as describe above (the documentation resides in `src/doc`).
However, you can also create an issue for it.
-- You can also contact us at **info (AT) linkahead.org** and join the
+- You can also contact us at **info (AT) indiscale.com** and join the
LinkAhead community on
[#linkahead:matrix.org](https://matrix.to/#/!unwwlTfOznjEnMMXxf:matrix.org).
diff --git a/src/core/js/reference_resolver/linkahead_default_person.js b/src/core/js/reference_resolver/linkahead_default_person.js
index f8aa34c5..f0b3f3fb 100644
--- a/src/core/js/reference_resolver/linkahead_default_person.js
+++ b/src/core/js/reference_resolver/linkahead_default_person.js
@@ -22,7 +22,7 @@
*/
/**
- * @module caosdb_default_person_reference
+ * @module linkahead_default_person_reference
* @version 0.1
*
* @description Replace the reference to a Person Record by the values of that
@@ -31,9 +31,9 @@
* TODO: Make name(s) of person RecordType(s) and names of firstname
* and lastname properties configurable.
*/
-var caosdb_default_person_reference = new function () {
+var linkahead_default_person_reference = new function () {
- var logger = log.getLogger("caosdb_default_person_reference");
+ var logger = log.getLogger("linkahead_default_person_reference");
const lastname_prop_name = "lastname"
const firstname_prop_name = "firstname"
@@ -61,7 +61,7 @@ var caosdb_default_person_reference = new function () {
if (resolve_references.is_child(entity, person_rt_name)) {
return {
- "text": caosdb_default_person_reference.get_person_str(entity)
+ "text": linkahead_default_person_reference.get_person_str(entity)
};
}
}
diff --git a/src/doc/tutorials/edit_mode.rst b/src/doc/tutorials/edit_mode.rst
index 68abae73..a2a0310f 100644
--- a/src/doc/tutorials/edit_mode.rst
+++ b/src/doc/tutorials/edit_mode.rst
@@ -6,7 +6,7 @@ Entities in LinkAhead can be changed, created, and deleted using the
be fairly familiar with the concepts of Records, RecordTypes and
Properties in LinkAhead. If you have doubts, please have a look at the
`data model documentation
-<https://docs.linkahead.org/linkhead-server/Data-Model.html>`_.
+<https://docs.indiscale.com/linkhead-server/Data-Model.html>`_.
.. contents::
:local:
@@ -31,7 +31,7 @@ Edit Mode``. Unsurprisingly, clicking here terminates the edit mode.
privileges. You can only create/edit/delete entities if your user
is allowed to do that. User and group permissions can be configured
in detail as explained in the `server documentation
- <https://docs.linkahead.org/linkhead-server/permissions.html>`_.
+ <https://docs.indiscale.com/linkhead-server/permissions.html>`_.
When you have entered the edit mode, you'll see the edit mode toolbox
appearing on the right hand side of your screen:
@@ -182,7 +182,7 @@ When creating a new Property, a Property card shows up:
Inheritance plays a role here! For example, if you select “Experiment”, all “Magnetism
Experiment” Records are also accepted (if they inherit from “Experiment”).
- See `here <https://docs.linkahead.org/linkhead-server/specification/Datatype.html>`_ for more
+ See `here <https://docs.indiscale.com/linkhead-server/specification/Datatype.html>`_ for more
information on the datatypes.
3. If you want the new Property to be a list, check the checkbox. List
diff --git a/test/core/js/modules/ext_prop_display.js.js b/test/core/js/modules/ext_prop_display.js.js
index e21c8140..cc12c340 100644
--- a/test/core/js/modules/ext_prop_display.js.js
+++ b/test/core/js/modules/ext_prop_display.js.js
@@ -28,7 +28,7 @@ QUnit.module("ext_prop_display.js", {
// setup before each test
// entity list, one entity with three properties (ids 1,2,3 for
// testing), all of them hidden by default.
- $(document.body).append('<div class="caosdb-f-main-entities prop-display-test-entities"><div id=115 class="caosdb-entity-panel"><div class="caosdb-entity-panel-heading"><span class="caosdb-f-parent-list"><span class="caosdb-parent-item"><a class="caosdb-parent-name" href="https://demo.linkahead.org/Entity/110">Guitar</a></span></span></div><div class="caosdb-entity-panel-body"><ul class="list-group caosdb-properties"><li id=1 class="caosdb-v-property-row caosdb-f-entity-property caosdb-v-hidden-property"><div class="row"><div class="caosdb-v-property-left-col"><span class="caosdb-property-name">first prop</span></div><div class="caosdb-f-property-value"><span class="caosdb-f-property-single-raw-value caosdb-property-text-value caosdb-f-property-text-value caosdb-v-property-text-value">48.0</span><span class="caosdb-unit">€</span></div></div></li><li id=2 class="caosdb-v-property-row caosdb-f-entity-property caosdb-v-hidden-property"><div class="row"><div class="caosdb-v-property-left-col"><span class="caosdb-property-name">second prop</span></div><div class="caosdb-f-property-value"><span class="caosdb-f-property-single-raw-value caosdb-property-text-value caosdb-f-property-text-value caosdb-v-property-text-value">48.0</span><span class="caosdb-unit">€</span></div></div></li><li id=3 class="caosdb-v-property-row caosdb-f-entity-property caosdb-v-hidden-property"><div class="row"><div class="caosdb-v-property-left-col"><span class="caosdb-property-name">third prop</span></div><div class="caosdb-f-property-value"><span class="caosdb-f-property-single-raw-value caosdb-property-text-value caosdb-f-property-text-value caosdb-v-property-text-value">48.0</span><span class="caosdb-unit">€</span></div></div></li></ul></div></div></div>');
+ $(document.body).append('<div class="caosdb-f-main-entities prop-display-test-entities"><div id=115 class="caosdb-entity-panel"><div class="caosdb-entity-panel-heading"><span class="caosdb-f-parent-list"><span class="caosdb-parent-item"><a class="caosdb-parent-name" href="https://demo.indiscale.com/Entity/110">Guitar</a></span></span></div><div class="caosdb-entity-panel-body"><ul class="list-group caosdb-properties"><li id=1 class="caosdb-v-property-row caosdb-f-entity-property caosdb-v-hidden-property"><div class="row"><div class="caosdb-v-property-left-col"><span class="caosdb-property-name">first prop</span></div><div class="caosdb-f-property-value"><span class="caosdb-f-property-single-raw-value caosdb-property-text-value caosdb-f-property-text-value caosdb-v-property-text-value">48.0</span><span class="caosdb-unit">€</span></div></div></li><li id=2 class="caosdb-v-property-row caosdb-f-entity-property caosdb-v-hidden-property"><div class="row"><div class="caosdb-v-property-left-col"><span class="caosdb-property-name">second prop</span></div><div class="caosdb-f-property-value"><span class="caosdb-f-property-single-raw-value caosdb-property-text-value caosdb-f-property-text-value caosdb-v-property-text-value">48.0</span><span class="caosdb-unit">€</span></div></div></li><li id=3 class="caosdb-v-property-row caosdb-f-entity-property caosdb-v-hidden-property"><div class="row"><div class="caosdb-v-property-left-col"><span class="caosdb-property-name">third prop</span></div><div class="caosdb-f-property-value"><span class="caosdb-f-property-single-raw-value caosdb-property-text-value caosdb-f-property-text-value caosdb-v-property-text-value">48.0</span><span class="caosdb-unit">€</span></div></div></li></ul></div></div></div>');
},
afterEach: function (assert) {
// teardown after each test
diff --git a/test/core/js/modules/ext_references.js.js b/test/core/js/modules/ext_references.js.js
index e42c8cbd..5dba22f1 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(caosdb_default_person_reference.get_person_str);
+ assert.ok(linkahead_default_person_reference.get_person_str);
});
QUnit.test("update_visible_references_without_summary", async function(assert){
--
GitLab