Convert current user details, current user locale profile details, home, license, maintenance and tool list views to CBV
This commit is contained in:
@@ -4,25 +4,23 @@ from django.conf.urls import patterns, url
|
|||||||
from django.contrib.staticfiles.templatetags.staticfiles import static
|
from django.contrib.staticfiles.templatetags.staticfiles import static
|
||||||
from django.views.generic import RedirectView
|
from django.views.generic import RedirectView
|
||||||
|
|
||||||
from .views import AboutView, HomeView, SetupListView, ToolsListView
|
from .views import (
|
||||||
|
AboutView, CurrentUserDetailsView, CurrentUserLocaleProfileDetailsView,
|
||||||
|
HomeView, LicenseView, MaintenanceMenuView, SetupListView, ToolsListView
|
||||||
|
)
|
||||||
|
|
||||||
urlpatterns = patterns('common.views',
|
urlpatterns = patterns('common.views',
|
||||||
url(r'^$', HomeView.as_view(), name='home'),
|
url(r'^$', HomeView.as_view(), name='home'),
|
||||||
url(r'^maintenance_menu/$', 'maintenance_menu', (), 'maintenance_menu'),
|
|
||||||
|
|
||||||
url(r'^about/$', AboutView.as_view(), name='about_view'),
|
url(r'^about/$', AboutView.as_view(), name='about_view'),
|
||||||
url(r'^license/$', 'license_view', (), name='license_view'),
|
url(r'^license/$', LicenseView.as_view(), name='license_view'),
|
||||||
url(r'^object/multiple/action/$', 'multi_object_action_view', (), name='multi_object_action_view'),
|
url(r'^maintenance_menu/$', MaintenanceMenuView.as_view(), name='maintenance_menu'),
|
||||||
|
url(r'^object/multiple/action/$', 'multi_object_action_view', name='multi_object_action_view'),
|
||||||
url(r'^user/$', 'current_user_details', (), name='current_user_details'),
|
|
||||||
url(r'^user/edit/$', 'current_user_edit', (), name='current_user_edit'),
|
|
||||||
|
|
||||||
url(r'^user/locale/$', 'current_user_locale_profile_details', (), name='current_user_locale_profile_details'),
|
|
||||||
url(r'^user/locale/edit/$', 'current_user_locale_profile_edit', (), name='current_user_locale_profile_edit'),
|
|
||||||
|
|
||||||
url(r'^setup/$', SetupListView.as_view(), name='setup_list'),
|
url(r'^setup/$', SetupListView.as_view(), name='setup_list'),
|
||||||
url(r'^tools/$', ToolsListView.as_view(), name='tools_list'),
|
url(r'^tools/$', ToolsListView.as_view(), name='tools_list'),
|
||||||
|
url(r'^user/$', CurrentUserDetailsView.as_view(), name='current_user_details'),
|
||||||
|
url(r'^user/edit/$', 'current_user_edit', name='current_user_edit'),
|
||||||
|
url(r'^user/locale/$', CurrentUserLocaleProfileDetailsView.as_view(), name='current_user_locale_profile_details'),
|
||||||
|
url(r'^user/locale/edit/$', 'current_user_locale_profile_edit', name='current_user_locale_profile_edit'),
|
||||||
)
|
)
|
||||||
|
|
||||||
urlpatterns += patterns('',
|
urlpatterns += patterns('',
|
||||||
|
|||||||
@@ -252,3 +252,9 @@ def fs_cleanup(filename, suppress_exceptions=True):
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def get_obj_from_content_type_string(string):
|
||||||
|
model, pk = string.split(',')
|
||||||
|
ct = ContentType.objects.get(model=model)
|
||||||
|
return ct.get_object_for_this_type(pk=pk)
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user