diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f0f06ca64..a5447da1e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,8 @@ Unreleased Added ----- +- **General** + - Cyberduck documentation (#1931) - **Isatemplates** - ``isatemplates`` app for custom ISA-Tab template management (#1961) - ``isatemplates_backend`` plugin for template retrieval (#1961) @@ -38,6 +40,7 @@ Changed - ``index`` arg in ``SampleSheetAssayPluginPoint.update_row()`` (#1957) - Hide template output dir field by default (#1960) - Improve ``StudyLinksAjaxView`` return data (#1963, #1966) + - Optimize ``irodsbackend`` API retrieval in ``plugins`` (#1952) - **Taskflowbackend** - Increase default for ``TASKFLOW_IRODS_CONN_TIMEOUT`` (#1900) - Disable lock requirement for role and project update flows (#1948) diff --git a/docs_manual/source/_static/sodar_ui/user_profile.png b/docs_manual/source/_static/sodar_ui/user_profile.png index aa8631880..42d00fdec 100644 Binary files a/docs_manual/source/_static/sodar_ui/user_profile.png and b/docs_manual/source/_static/sodar_ui/user_profile.png differ diff --git a/docs_manual/source/admin_settings.rst b/docs_manual/source/admin_settings.rst index 27636cb60..ba243c042 100644 --- a/docs_manual/source/admin_settings.rst +++ b/docs_manual/source/admin_settings.rst @@ -35,7 +35,6 @@ Documentation on settings is linked below. - `Projectroles (the core project and site framework) `_ - `Admin Alerts `_ - `App Alerts `_ -- `Taskflow Backend `_ - `Timeline `_ .. _admin_settings_backend: diff --git a/docs_manual/source/ui_user_profile.rst b/docs_manual/source/ui_user_profile.rst index cf39797dd..94a72b4b3 100644 --- a/docs_manual/source/ui_user_profile.rst +++ b/docs_manual/source/ui_user_profile.rst @@ -20,6 +20,10 @@ Sample Sheet Table Height from a set of options. In browsing mode, table height will fit the table content if the height of content is lower than the setting. In edit mode, the chosen table height will be maintained regardless of content. +Display Template Output Directory Field + Display or hide the "output directory" field in sample sheet template + creation form. This can be enabled if there is need to control the output + directory in sample sheet ISA-Tab exports. Defaults to false. Display Project UUID Copying Link Enabling this will add an icon next to the project title on each project view. Clicking it will copy the project identifier (UUID) into the diff --git a/irodsbackend/plugins.py b/irodsbackend/plugins.py index a9e57f680..7e623f9d4 100644 --- a/irodsbackend/plugins.py +++ b/irodsbackend/plugins.py @@ -41,7 +41,7 @@ class BackendPlugin(BackendPluginPoint): #: Title (used in templates) title = 'iRODS Backend' - #: FontAwesome icon ID string + #: Iconify icon icon = 'mdi:database-search' #: Description string diff --git a/landingzones/plugins.py b/landingzones/plugins.py index c4ff945a5..1c0e5e014 100644 --- a/landingzones/plugins.py +++ b/landingzones/plugins.py @@ -158,11 +158,11 @@ def get_statistics(self): """ return { 'zones_total': { - 'label': 'Total zones', + 'label': 'Total Zones', 'value': LandingZone.objects.count(), }, 'zones_active': { - 'label': 'Active zones', + 'label': 'Active Zones', 'value': LandingZone.objects.filter( status__in=STATUS_ALLOW_UPDATE ).count(), @@ -170,7 +170,7 @@ def get_statistics(self): 'failed)', }, 'zones_finished': { - 'label': 'Finished zones', + 'label': 'Finished Zones', 'value': LandingZone.objects.filter( status__in=STATUS_FINISHED ).count(), @@ -178,7 +178,7 @@ def get_statistics(self): 'or not created', }, 'zones_busy': { - 'label': 'Busy zones', + 'label': 'Busy Zones', 'value': LandingZone.objects.filter( status__in=STATUS_BUSY ).count(), diff --git a/landingzones/views.py b/landingzones/views.py index 1308d69c1..0819644da 100644 --- a/landingzones/views.py +++ b/landingzones/views.py @@ -639,7 +639,7 @@ class ZoneDeleteView( http_method_names = ['get', 'post'] template_name = 'landingzones/landingzone_confirm_delete.html' zone_action = 'delete' - # NOTE: permission_required comes from ZoneUpdateRequiredPermissionMixin + # NOTE: permission_required comes from ZoneModifyPermissionMixin def get_context_data(self, *args, **kwargs): context = super().get_context_data(*args, **kwargs) @@ -706,7 +706,7 @@ class ZoneMoveView( http_method_names = ['get', 'post'] template_name = 'landingzones/landingzone_confirm_move.html' zone_action = 'move' - # NOTE: permission_required comes from ZoneUpdateRequiredPermissionMixin + # NOTE: permission_required comes from ZoneModifyPermissionMixin def get_context_data(self, *args, **kwargs): context = super().get_context_data(*args, **kwargs) diff --git a/ontologyaccess/plugins.py b/ontologyaccess/plugins.py index 4efa369f5..f2fb1e8ec 100644 --- a/ontologyaccess/plugins.py +++ b/ontologyaccess/plugins.py @@ -42,7 +42,7 @@ class BackendPlugin(BackendPluginPoint): #: Title (used in templates) title = 'Ontology Access Backend' - #: FontAwesome icon ID string + #: Iconify icon icon = 'mdi:tags' #: Description string @@ -58,11 +58,11 @@ def get_api(self, **kwargs): def get_statistics(self): return { 'obo_ontology_count': { - 'label': 'OBO ontologies', + 'label': 'OBO Ontologies', 'value': OBOFormatOntology.objects.count(), }, 'obo_term_count': { - 'label': 'OBO ontology terms', + 'label': 'OBO Ontology Terms', 'value': OBOFormatOntologyTerm.objects.count(), }, } diff --git a/ontologyaccess/templates/ontologyaccess/list.html b/ontologyaccess/templates/ontologyaccess/list.html index af7f2792d..6ea3c0920 100644 --- a/ontologyaccess/templates/ontologyaccess/list.html +++ b/ontologyaccess/templates/ontologyaccess/list.html @@ -52,7 +52,7 @@

Ontology Access

{% if object_list.count > 0 %} -
+

OBO Format Ontologies

@@ -77,7 +77,8 @@

OBO Format Ontologies

{{ o.terms.all.count }} {{ o.date_created | date:'Y-m-d H:i' }} -
+