Skip to content

Commit

Permalink
Fix for #2014: Former network URL isn't working anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderWatzinger committed May 9, 2023
1 parent e3fea7e commit 95d6eaa
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion config/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from config.database_versions import DATABASE_VERSIONS

VERSION = '7.13.0'
VERSION = '7.13.1'
DATABASE_VERSION = DATABASE_VERSIONS[0]
DEMO_MODE = False # If activated some options are disabled, login is prefilled

Expand Down
3 changes: 3 additions & 0 deletions install/upgrade/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ base, then run the database upgrade script, then restart Apache:
sudo python3 install/upgrade/database_upgrade.py
sudo service apache2 restart

### 7.13.0 to 7.13.1
A code base update (e.g. with git pull) and a webserver restart is sufficient.

### 7.12.0 to 7.13.0
7.13.0.sql is needed but will be taken care of by the database upgrade script.

Expand Down
2 changes: 2 additions & 0 deletions openatlas/views/changelog.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ def index_changelog() -> str:


versions = {
'7.13.1': ['2023-05-09', {
'fix': {'2014': "Former network URL isn't working anymore"}}],
'7.13.0': ['2023-05-06', {
'feature': {
'1952': 'E11 Modification',
Expand Down
10 changes: 7 additions & 3 deletions openatlas/views/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,13 @@ class NetworkForm(FlaskForm):
widget=widgets.ListWidget(prefix_label=False))


@app.route('/network/<int:dimensions>', methods=["GET", "POST"])
@app.route('/network/<int:dimensions>/<int:id_>', methods=["GET", "POST"])
def network(dimensions: int, id_: Optional[int] = None) -> str:
@app.route('/overview/network/', methods=["GET", "POST"])
@app.route('/overview/network/<int:dimensions>', methods=["GET", "POST"])
@app.route(
'/overview/network/<int:dimensions>/<int:id_>',
methods=["GET", "POST"])
@required_group('readonly')
def network(dimensions: Optional[int] = 0, id_: Optional[int] = None) -> str:
entity = Entity.get_by_id(id_) if id_ else None
classes = [c for c in g.classes.values() if c.network_color]
for class_ in classes:
Expand Down

0 comments on commit 95d6eaa

Please sign in to comment.