Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for nav menu width inconsistency on add resource #11548

Open
wants to merge 7 commits into
base: dev/8.0.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arches/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 1 addition & 0 deletions arches/app/media/css/sidenav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
a {
padding: 3px 20px;
font-weight: 400;
min-width: 120px;
}
}
.list-divider-dark {
Expand Down
4 changes: 2 additions & 2 deletions arches/app/models/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions arches/app/permissions/arches_permission_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 []
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
31 changes: 31 additions & 0 deletions releases/7.6.1.md
Original file line number Diff line number Diff line change
@@ -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
```
32 changes: 32 additions & 0 deletions releases/7.6.2.md
Original file line number Diff line number Diff line change
@@ -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
```