diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2018-04-12 15:52:45 +1200 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2018-04-24 10:15:47 +1200 |
commit | a918098981daad9b5d50f526e0973c8feff4c8fc (patch) | |
tree | 2db29c50f812f5c5088c0b12eece370c9df8202b /layerindex | |
parent | 095f4acd6f2eaf6988ae50a2c9e5871e79e7ce7d (diff) | |
download | openembedded-core-contrib-a918098981daad9b5d50f526e0973c8feff4c8fc.tar.gz |
Stop using string name for publish view in urls.py
Rename publish() to publish_view() and call it directly from the view
rather than using a string name (which is not possible in Django 1.10+).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex')
-rw-r--r-- | layerindex/urls.py | 4 | ||||
-rw-r--r-- | layerindex/views.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/layerindex/urls.py b/layerindex/urls.py index d2f9eab228..111e50571c 100644 --- a/layerindex/urls.py +++ b/layerindex/urls.py @@ -8,7 +8,7 @@ from django.conf.urls import * from django.views.generic import TemplateView, DetailView, ListView, RedirectView from django.views.defaults import page_not_found from django.core.urlresolvers import reverse_lazy -from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDetailView, RecipeSearchView, MachineSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, HistoryListView, EditProfileFormView, AdvancedRecipeSearchView, BulkChangeView, BulkChangeSearchView, bulk_change_edit_view, bulk_change_patch_view, BulkChangeDeleteView, RecipeDetailView, RedirectParamsView, ClassicRecipeSearchView, ClassicRecipeDetailView, ClassicRecipeStatsView, LayerUpdateDetailView, UpdateListView, UpdateDetailView, StatsView +from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDetailView, RecipeSearchView, MachineSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, HistoryListView, EditProfileFormView, AdvancedRecipeSearchView, BulkChangeView, BulkChangeSearchView, bulk_change_edit_view, bulk_change_patch_view, BulkChangeDeleteView, RecipeDetailView, RedirectParamsView, ClassicRecipeSearchView, ClassicRecipeDetailView, ClassicRecipeStatsView, LayerUpdateDetailView, UpdateListView, UpdateDetailView, StatsView, publish_view from layerindex.models import LayerItem, Recipe, RecipeChangeset from rest_framework import routers from . import restviews @@ -72,7 +72,7 @@ urlpatterns = patterns('', RecipeDetailView.as_view( template_name='layerindex/recipedetail.html'), name='recipe'), - url(r'^layer/(?P<name>[-\w]+)/publish/$', 'layerindex.views.publish', name="publish"), + url(r'^layer/(?P<name>[-\w]+)/publish/$', publish_view, name="publish"), url(r'^layerupdate/(?P<pk>[-\w]+)/$', LayerUpdateDetailView.as_view( template_name='layerindex/layerupdate.html'), diff --git a/layerindex/views.py b/layerindex/views.py index 7a48f3ef0d..5e6227134b 100644 --- a/layerindex/views.py +++ b/layerindex/views.py @@ -258,7 +258,7 @@ def _check_url_branch(kwargs): raise Http404 branch = get_object_or_404(Branch, name=branchname) -def publish(request, name): +def publish_view(request, name): if not (request.user.is_authenticated() and request.user.has_perm('layerindex.publish_layer')): raise PermissionDenied layeritem = get_object_or_404(LayerItem, name=name) |