From 6cd6f52b03fd59b5f9bb621dcf4589e578ecfd2e Mon Sep 17 00:00:00 2001 From: Nicolas CARPi Date: Wed, 8 Jan 2025 11:49:10 +0100 Subject: [PATCH 1/2] add exp/resources description in generalities and bump sphinx versions because it doesn't work with python 3.13 otherwise --- doc/generalities.rst | 12 +++++++----- requirements.txt | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/generalities.rst b/doc/generalities.rst index 81fb13e..5207ed0 100644 --- a/doc/generalities.rst +++ b/doc/generalities.rst @@ -52,14 +52,16 @@ Every Team has one or several Admin, who can change many settings affecting user Teams are created by the Sysadmin from the Sysconfig page (:ref:`see documentation `). -Entities and permissions -======================== +Experiments and Resources +========================= -An Entity is an entry, which can be an Experiment, a Resource or an experiment Template. +There are two main types of records that exist: **Experiments** and **Resources**. They are listed in their corresponding page, accessible from the main top menu. -By default, Experiments and Resources are restricted to a team. But users can choose to extend this to all registered users or even anonymous users if enabled by the Sysadmin. +**Experiments** are the main aspect of the ELN: it is where users log their results. -Experiments belong to a user (owner), while Resources are common to the team and can be edited by anyone from the team (with default permissions). +**Resources** correspond to a repository of *things* present in the lab, generally physical things, such as plasmids, equipments, antibodies, chemical products, etc... They have different properties than experiments, although both objects are similar in many aspects. A Resource can be made bookable (so they can be booked in the Scheduler) or procurable (so we can order more of it). + +By default, Experiments and Resources are restricted to a team. But users can choose to extend this to all registered users or even anonymous users if enabled by the Sysadmin. An extensive fine-grained permission system is available for both types of records and their corresponding templates to have complete control on who get to read/write what. User accounts ============= diff --git a/requirements.txt b/requirements.txt index 3c76ffc..8f346a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -sphinx==6.1.3 -sphinx_rtd_theme==1.2.0rc3 +sphinx==8.1.3 +sphinx_rtd_theme==3.0.2 sphinxcontrib-jquery From 60407fff46abbe3b1e7cd53c5456270df32e5dfd Mon Sep 17 00:00:00 2001 From: Nicolas CARPi Date: Wed, 8 Jan 2025 12:20:53 +0100 Subject: [PATCH 2/2] fix typo --- doc/generalities.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/generalities.rst b/doc/generalities.rst index 5207ed0..cb42a2c 100644 --- a/doc/generalities.rst +++ b/doc/generalities.rst @@ -59,7 +59,7 @@ There are two main types of records that exist: **Experiments** and **Resources* **Experiments** are the main aspect of the ELN: it is where users log their results. -**Resources** correspond to a repository of *things* present in the lab, generally physical things, such as plasmids, equipments, antibodies, chemical products, etc... They have different properties than experiments, although both objects are similar in many aspects. A Resource can be made bookable (so they can be booked in the Scheduler) or procurable (so we can order more of it). +**Resources** correspond to a repository of *things* present in the lab, generally physical things, such as plasmids, equipment, antibodies, chemical products, etc... They have different properties than experiments, although both objects are similar in many aspects. A Resource can be made bookable (so they can be booked in the Scheduler) or procurable (so we can order more of it). By default, Experiments and Resources are restricted to a team. But users can choose to extend this to all registered users or even anonymous users if enabled by the Sysadmin. An extensive fine-grained permission system is available for both types of records and their corresponding templates to have complete control on who get to read/write what.