openstack
/
mistral-dashboard
Code Issues Proposed changes

Merge "Address RemovedInDjango40Warning"

This commit is contained in:
Zuul 2022-08-08 17:11:04 +00:00 committed by Gerrit Code Review
parent 5adb5bfad7 72e898910f
commit c3daa34c60
7 changed files with 74 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mistraldashboard/action_executions/urls.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import url # noqa from django.urls import re_path
from mistraldashboard.action_executions import views from mistraldashboard.action_executions import views
@ -20,15 +20,15 @@ ACTION_EXECUTIONS = r'^(?P<action_execution_id>[^/]+)/%s$'
TASKS = r'^(?P<task_id>[^/]+)/%s$' TASKS = r'^(?P<task_id>[^/]+)/%s$'
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(ACTION_EXECUTIONS % 'detail', views.OverviewView.as_view(), re_path(ACTION_EXECUTIONS % 'detail', views.OverviewView.as_view(),
name='detail'), name='detail'),
url(ACTION_EXECUTIONS % 'input', views.CodeView.as_view(), re_path(ACTION_EXECUTIONS % 'input', views.CodeView.as_view(),
{'column': 'input'}, name='input'), {'column': 'input'}, name='input'),
url(ACTION_EXECUTIONS % 'output', views.CodeView.as_view(), re_path(ACTION_EXECUTIONS % 'output', views.CodeView.as_view(),
{'column': 'output'}, name='output'), {'column': 'output'}, name='output'),
url(ACTION_EXECUTIONS % 'update', views.UpdateView.as_view(), re_path(ACTION_EXECUTIONS % 'update', views.UpdateView.as_view(),
name='update'), name='update'),
url(TASKS % 'task', views.FilteredByTaskView.as_view(), re_path(TASKS % 'task', views.FilteredByTaskView.as_view(),
name='task') name='task')
] ]

12
mistraldashboard/actions/urls.py
View File

@ -12,16 +12,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import url # noqa from django.urls import re_path
from mistraldashboard.actions import views from mistraldashboard.actions import views
ACTIONS = r'^(?P<action_name>[^/]+)/%s$' ACTIONS = r'^(?P<action_name>[^/]+)/%s$'
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(ACTIONS % 'detail', views.DetailView.as_view(), name='detail'), re_path(ACTIONS % 'detail', views.DetailView.as_view(), name='detail'),
url(ACTIONS % 'run', views.RunView.as_view(), name='run'), re_path(ACTIONS % 'run', views.RunView.as_view(), name='run'),
url(r'^create$', views.CreateView.as_view(), name='create'), re_path(r'^create$', views.CreateView.as_view(), name='create'),
url(r'^update$', views.UpdateView.as_view(), name='update'), re_path(r'^update$', views.UpdateView.as_view(), name='update'),
] ]

9
mistraldashboard/cron_triggers/urls.py
View File

@ -12,14 +12,15 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import url # noqa from django.urls import re_path
from mistraldashboard.cron_triggers import views from mistraldashboard.cron_triggers import views
CRON_TRIGGERS = r'^(?P<cron_trigger_name>[^/]+)/%s$' CRON_TRIGGERS = r'^(?P<cron_trigger_name>[^/]+)/%s$'
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(CRON_TRIGGERS % 'detail', views.OverviewView.as_view(), name='detail'), re_path(CRON_TRIGGERS % 'detail', views.OverviewView.as_view(),
url(r'^create$', views.CreateView.as_view(), name='create'), name='detail'),
re_path(r'^create$', views.CreateView.as_view(), name='create'),
] ]

26
mistraldashboard/executions/urls.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import url # noqa from django.urls import re_path
from mistraldashboard.executions import views from mistraldashboard.executions import views
@ -20,16 +20,16 @@ EXECUTIONS = r'^(?P<execution_id>[^/]+)/%s$'
TASKS = r'^(?P<task_execution_id>[^/]+)/%s$' TASKS = r'^(?P<task_execution_id>[^/]+)/%s$'
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(EXECUTIONS % 'detail', views.DetailView.as_view(), name='detail'), re_path(EXECUTIONS % 'detail', views.DetailView.as_view(), name='detail'),
url(TASKS % 'tasks', views.TasksView.as_view(), name='tasks'), re_path(TASKS % 'tasks', views.TasksView.as_view(), name='tasks'),
url(EXECUTIONS % 'detail_task_id', views.DetailView.as_view(), re_path(EXECUTIONS % 'detail_task_id', views.DetailView.as_view(),
{'caller': 'task'}, name='detail_task_id'), {'caller': 'task'}, name='detail_task_id'),
url(EXECUTIONS % 'output', views.CodeView.as_view(), re_path(EXECUTIONS % 'output', views.CodeView.as_view(),
{'column': 'output'}, name='output'), {'column': 'output'}, name='output'),
url(EXECUTIONS % 'input', views.CodeView.as_view(), re_path(EXECUTIONS % 'input', views.CodeView.as_view(),
{'column': 'input'}, name='input'), {'column': 'input'}, name='input'),
url(EXECUTIONS % 'update_description', re_path(EXECUTIONS % 'update_description',
views.UpdateDescriptionView.as_view(), views.UpdateDescriptionView.as_view(),
name='update_description'), name='update_description'),
] ]

20
mistraldashboard/tasks/urls.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import url # noqa from django.urls import re_path
from mistraldashboard.tasks import views from mistraldashboard.tasks import views
@ -20,13 +20,13 @@ TASKS = r'^(?P<task_id>[^/]+)/%s$'
EXECUTIONS = r'^(?P<execution_id>[^/]+)/%s$' EXECUTIONS = r'^(?P<execution_id>[^/]+)/%s$'
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(TASKS % 'detail', views.OverviewView.as_view(), name='detail'), re_path(TASKS % 'detail', views.OverviewView.as_view(), name='detail'),
url(EXECUTIONS % 'execution', re_path(EXECUTIONS % 'execution',
views.ExecutionView.as_view(), views.ExecutionView.as_view(),
name='execution'), name='execution'),
url(TASKS % 'result', views.CodeView.as_view(), re_path(TASKS % 'result', views.CodeView.as_view(),
{'column': 'result'}, name='result'), {'column': 'result'}, name='result'),
url(TASKS % 'published', views.CodeView.as_view(), re_path(TASKS % 'published', views.CodeView.as_view(),
{'column': 'published'}, name='published'), {'column': 'published'}, name='published'),
] ]

22
mistraldashboard/workbooks/urls.py
View File

@ -12,21 +12,21 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import url # noqa from django.urls import re_path
from mistraldashboard.workbooks import views from mistraldashboard.workbooks import views
WORKBOOKS = r'^(?P<workbook_name>[^/]+)/%s$' WORKBOOKS = r'^(?P<workbook_name>[^/]+)/%s$'
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(r'^select_definition$', re_path(r'^select_definition$',
views.SelectDefinitionView.as_view(), views.SelectDefinitionView.as_view(),
name='select_definition'), name='select_definition'),
url(r'^change_definition$', re_path(r'^change_definition$',
views.ChangeDefinitionView.as_view(), views.ChangeDefinitionView.as_view(),
name='change_definition'), name='change_definition'),
url(r'^create$', views.CreateView.as_view(), name='create'), re_path(r'^create$', views.CreateView.as_view(), name='create'),
url(r'^update$', views.UpdateView.as_view(), name='update'), re_path(r'^update$', views.UpdateView.as_view(), name='update'),
url(WORKBOOKS % 'detail', views.DetailView.as_view(), name='detail'), re_path(WORKBOOKS % 'detail', views.DetailView.as_view(), name='detail'),
] ]

33
mistraldashboard/workflows/urls.py
View File

@ -12,26 +12,27 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import url # noqa from django.urls import re_path
from mistraldashboard.workflows import views from mistraldashboard.workflows import views
WORKFLOWS = r'^(?P<workflow_name>[^/]+)/%s$' WORKFLOWS = r'^(?P<workflow_name>[^/]+)/%s$'
urlpatterns = [ urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'), re_path(r'^$', views.IndexView.as_view(), name='index'),
url(r'^select_definition$', re_path(r'^select_definition$',
views.SelectDefinitionView.as_view(), views.SelectDefinitionView.as_view(),
name='select_definition'), name='select_definition'),
url(r'^change_definition$', re_path(r'^change_definition$',
views.ChangeDefinitionView.as_view(), views.ChangeDefinitionView.as_view(),
name='change_definition'), name='change_definition'),
url(r'^create$', views.CreateView.as_view(), name='create'), re_path(r'^create$', views.CreateView.as_view(), name='create'),
url(r'^update$', views.UpdateView.as_view(), name='update'), re_path(r'^update$', views.UpdateView.as_view(), name='update'),
url(WORKFLOWS % 'execute', views.ExecuteView.as_view(), name='execute'), re_path(WORKFLOWS % 'execute', views.ExecuteView.as_view(),
url(WORKFLOWS % 'detail', views.DetailView.as_view(), name='detail'), name='execute'),
url(WORKFLOWS % 'definition', views.CodeView.as_view(), re_path(WORKFLOWS % 'detail', views.DetailView.as_view(), name='detail'),
{'column': 'definition'}, name='definition'), re_path(WORKFLOWS % 'definition', views.CodeView.as_view(),
url(WORKFLOWS % 'input', views.CodeView.as_view(), {'column': 'definition'}, name='definition'),
{'column': 'input'}, name='input'), re_path(WORKFLOWS % 'input', views.CodeView.as_view(),
{'column': 'input'}, name='input'),
] ]