diff --git a/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py b/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py index 51cadab8b36..04fae452be9 100644 --- a/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py +++ b/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py @@ -69,6 +69,12 @@ def upgrade(): name=interface_name, schema=schema )) if results: + op.execute( + "DELETE it.* FROM {schema}.interface_theme it " + "INNER JOIN {schema}.interface i ON it.interface_id = i.id WHERE i.name='{name}'".format( + name=interface_name, schema=schema + ) + ) op.execute("DELETE FROM {schema}.interface WHERE name='{name}'".format( name=interface_name, schema=schema )) @@ -97,6 +103,12 @@ def downgrade(): name=interface_name, schema=schema )) if results: + op.execute( + "DELETE it.* FROM {schema}.interface_theme it " + "INNER JOIN {schema}.interface i ON it.interface_id = i.id WHERE i.name='{name}'".format( + name=interface_name, schema=schema + ) + ) op.execute("DELETE FROM {schema}.interface WHERE name='{name}'".format( name=interface_name, schema=schema )) diff --git a/docker/build/requirements.txt b/docker/build/requirements.txt index 17d770dfea8..8e743c11508 100644 --- a/docker/build/requirements.txt +++ b/docker/build/requirements.txt @@ -56,6 +56,7 @@ pyramid_mako==1.0.2 # geoportal pyramid_multiauth==0.9.0 # geoportal pyramid_tm==2.2.1 # geoportal pytest-cov==2.6.1 # tests +pytest-html==1.22.0 # For Travis pytest-selenium==1.16.0 # admin tests python-dateutil==2.6.1 # geoportal, rq.filter: <2.7.0 PyYAML==5.1 # geoportal diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl index 05103f16340..47e4b6722df 100644 --- a/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl +++ b/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl @@ -12,9 +12,11 @@ Information 2. The WMTS capabilities is now generated on runtime. -3. If not already done the 'api' and 'iframe_api' will be created, and the 'edit' and 'routing' interface - will be removed. After the database upgrade you can run the following request to fill e.-g. the api's - interfaces with the desktop interface: +3. If not already done the 'edit' and 'routing' interfaces and their relations will be removed from the + database, If you don't want that, you should rename the interfaces before applying the alembic scripts. + +4. If not already done the 'api' and 'iframe_api' will be created. After the database upgrade you can run + the following request to fill e.-g. the api's interfaces with the desktop interface: INSERT INTO main.interface_layer (interface_id, layer_id) SELECT , layer_id FROM main.interface_layer WHERE interface_id = ;