diff --git a/README.md b/README.md index d9eca89841b..f0c21a059b2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Issue reports are encouraged! [Please read this article](http://polite.technolog * [Report a Bug](https://github.com/archesproject/arches/issues/new?template=bug.md) * [File a Feature Ticket](https://github.com/archesproject/arches/issues/new?template=feature.md) -[Version 7.6.0 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.0.md) +[Version 7.6.1 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.1.md) #### Quick Install @@ -63,20 +63,6 @@ Our general release cycle will typically be a functional release (either major i The following a general plan for the Arches project. Be aware this plan is tentative and subject to change. -## 7.6 LTS - Release date: Sept 15, 2024 -- Arches Application improvements -- Security enhancements -- Default deny permissions -- Support for pluggable permissions frameworks -- Standalone plugins -- Customizable Search -- Concept label bulk editor module -- Map performance improvments -- Postgres 14 becomes minimum Postgres version - -## 7.6 - Supported Applications - - Workflow Builder - ## 8.0 - Release date: June 15, 2025 - Activity stream enhancements - Support for editing and publishing graphs without having to remove resource instances diff --git a/arches/__init__.py b/arches/__init__.py index 59ec910e3d2..093725de3b2 100644 --- a/arches/__init__.py +++ b/arches/__init__.py @@ -11,6 +11,6 @@ pass # VERSION[3] options = "alpha", "beta", "rc", or "final" -VERSION = (7, 6, 0, "beta", 0) +VERSION = (7, 6, 1, "beta", 0) __version__ = get_version(VERSION) diff --git a/arches/app/media/css/sidenav.scss b/arches/app/media/css/sidenav.scss index 29b394dc79f..d28a5e8e514 100644 --- a/arches/app/media/css/sidenav.scss +++ b/arches/app/media/css/sidenav.scss @@ -96,6 +96,7 @@ a { padding: 3px 20px; font-weight: 400; + min-width: 120px; } } .list-divider-dark { diff --git a/arches/app/models/resource.py b/arches/app/models/resource.py index 6cf3c40f20d..b0d88c85b3e 100644 --- a/arches/app/models/resource.py +++ b/arches/app/models/resource.py @@ -887,8 +887,8 @@ def get_relations( ) filtered_instances = filtered_instances if user is not None else [] - resourceid_to_permission = resourceid_to not in filtered_instances - resourceid_from_permission = resourceid_from not in filtered_instances + resourceid_to_permission = str(resourceid_to) not in filtered_instances + resourceid_from_permission = str(resourceid_from) not in filtered_instances if exclusive_set: resourceid_to_permission = not (resourceid_to_permission) diff --git a/arches/app/permissions/arches_permission_base.py b/arches/app/permissions/arches_permission_base.py index 14396761efe..3a289d30077 100644 --- a/arches/app/permissions/arches_permission_base.py +++ b/arches/app/permissions/arches_permission_base.py @@ -585,6 +585,7 @@ def get_all_default_permissions(self, model: Model = None): if ( not default_permissions_settings or model is None + or hasattr(model, "graph_id") is False or str(model.graph_id) not in default_permissions_settings ): return [] diff --git a/package.json b/package.json index cacd7bd8071..039f104c50a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arches", - "version": "7.6.0", + "version": "7.6.1", "license": "AGPL-3.0-only", "scripts": { "build_development": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=2048 webpack --config ./webpack/webpack.config.dev.js", diff --git a/releases/7.6.1.md b/releases/7.6.1.md new file mode 100644 index 00000000000..47db54dd23c --- /dev/null +++ b/releases/7.6.1.md @@ -0,0 +1,31 @@ +Arches 7.6.1 Release Notes +-------------------------- + +### Bug Fixes and Enhancements + +- Fixes bug causing the map layer manager to fail if a system uses DEFAULT_PERMISSIONS setting #[115522](https://github.com/archesproject/arches/issues/11522) + +### Dependency changes: +``` +Python: + Upgraded: + None + +JavaScript: + Upgraded: + none +``` + +### Upgrading Arches + +1. Upgrade to version 7.6.0 before proceeding by following the upgrade process in the [Version 7.6.0 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.0.md) + +2. Upgrade to Arches 7.6.1 + ``` + pip install --upgrade arches==7.6.1 + ``` + +3. If you are running Arches on Apache, be restart your server: + ``` + sudo service apache2 reload + ``` diff --git a/releases/7.6.2.md b/releases/7.6.2.md new file mode 100644 index 00000000000..c8c7763148e --- /dev/null +++ b/releases/7.6.2.md @@ -0,0 +1,32 @@ +## Arches 7.6.2 Release Notes + +### Bug Fixes and Enhancements + +- Fixes bug in which resource relationships fail to appear in visualize mode if using default deny as a non-superuser #[11539](https://github.com/archesproject/arches/pull/11539) + +### Dependency changes: + +``` +Python: + Upgraded: + None + +JavaScript: + Upgraded: + none +``` + +### Upgrading Arches + +1. Upgrade to version 7.6.0 before proceeding by following the upgrade process in the [Version 7.6.0 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.0.md) + +2. Upgrade to Arches 7.6.2 + + ``` + pip install --upgrade arches==7.6.2 + ``` + +3. If you are running Arches on Apache, be restart your server: + ``` + sudo service apache2 reload + ```