From d1f9b043bc2b30faf0be9e4feb9f25e8e3c8245f Mon Sep 17 00:00:00 2001 From: Karutsuki Date: Tue, 7 Mar 2023 16:36:26 +0100 Subject: [PATCH 1/2] fix capitalisation of file names --- elabjournal/elabjournal/{experiment.py => Experiment.py} | 0 elabjournal/elabjournal/{group.py => Group.py} | 0 elabjournal/elabjournal/{project.py => Project.py} | 0 elabjournal/elabjournal/{sample.py => Sample.py} | 0 elabjournal/elabjournal/{section.py => Section.py} | 0 elabjournal/elabjournal/{storage.py => Storage.py} | 0 elabjournal/elabjournal/{study.py => Study.py} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename elabjournal/elabjournal/{experiment.py => Experiment.py} (100%) rename elabjournal/elabjournal/{group.py => Group.py} (100%) rename elabjournal/elabjournal/{project.py => Project.py} (100%) rename elabjournal/elabjournal/{sample.py => Sample.py} (100%) rename elabjournal/elabjournal/{section.py => Section.py} (100%) rename elabjournal/elabjournal/{storage.py => Storage.py} (100%) rename elabjournal/elabjournal/{study.py => Study.py} (100%) diff --git a/elabjournal/elabjournal/experiment.py b/elabjournal/elabjournal/Experiment.py similarity index 100% rename from elabjournal/elabjournal/experiment.py rename to elabjournal/elabjournal/Experiment.py diff --git a/elabjournal/elabjournal/group.py b/elabjournal/elabjournal/Group.py similarity index 100% rename from elabjournal/elabjournal/group.py rename to elabjournal/elabjournal/Group.py diff --git a/elabjournal/elabjournal/project.py b/elabjournal/elabjournal/Project.py similarity index 100% rename from elabjournal/elabjournal/project.py rename to elabjournal/elabjournal/Project.py diff --git a/elabjournal/elabjournal/sample.py b/elabjournal/elabjournal/Sample.py similarity index 100% rename from elabjournal/elabjournal/sample.py rename to elabjournal/elabjournal/Sample.py diff --git a/elabjournal/elabjournal/section.py b/elabjournal/elabjournal/Section.py similarity index 100% rename from elabjournal/elabjournal/section.py rename to elabjournal/elabjournal/Section.py diff --git a/elabjournal/elabjournal/storage.py b/elabjournal/elabjournal/Storage.py similarity index 100% rename from elabjournal/elabjournal/storage.py rename to elabjournal/elabjournal/Storage.py diff --git a/elabjournal/elabjournal/study.py b/elabjournal/elabjournal/Study.py similarity index 100% rename from elabjournal/elabjournal/study.py rename to elabjournal/elabjournal/Study.py From 360cdcb92432549e66c2eb954899c96585476cc8 Mon Sep 17 00:00:00 2001 From: Karutsuki Date: Tue, 7 Mar 2023 16:39:21 +0100 Subject: [PATCH 2/2] fix pagination bug in experiment api --- elabjournal/elabjournal/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elabjournal/elabjournal/api.py b/elabjournal/elabjournal/api.py index aefea76..d07fd01 100644 --- a/elabjournal/elabjournal/api.py +++ b/elabjournal/elabjournal/api.py @@ -1334,7 +1334,7 @@ def _experiment(self, id, page): return(Experiment(self, dataItem)) page+=1 if page < maxPage: - return(self.experiment(id,page)) + return(self._experiment(id,page)) else: return(None) else: