matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change home and setup list views to CBVs

Browse Source
This commit is contained in:
Roberto Rosario
2015-04-07 01:27:33 -04:00
parent 735cd64db2
commit 7811d1e090
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/common/urls.py
View File

@@ -4,11 +4,11 @@ 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, ToolsListView from .views import AboutView, HomeView, SetupListView, ToolsListView
urlpatterns = patterns('common.views', urlpatterns = patterns('common.views',
url(r'^$', 'home', (), 'home'), url(r'^$', HomeView.as_view(), name='home'),
url(r'^maintenance_menu/$', 'maintenance_menu', (), 'maintenance_menu'), 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'),
@@ -21,7 +21,7 @@ urlpatterns = patterns('common.views',
url(r'^user/locale/$', 'current_user_locale_profile_details', (), name='current_user_locale_profile_details'), 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'^user/locale/edit/$', 'current_user_locale_profile_edit', (), name='current_user_locale_profile_edit'),
url(r'^setup/$', 'setup_list', (), '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'),
) )

43
mayan/apps/common/views.py
View File

@@ -419,14 +419,16 @@ class MultiFormView(FormView):
return self.forms_invalid(forms) return self.forms_invalid(forms)
def setup_list(request): class SetupListView(TemplateView):
context = { template_name = 'appearance/generic_list_horizontal.html'
'object_navigation_links': menu_setup.resolve(context=RequestContext(request)),
'title': _('Setup items'),
}
return render_to_response('appearance/generic_list_horizontal.html', context, def get_context_data(self, **kwargs):
context_instance=RequestContext(request)) data = super(SetupListView, self).get_context_data(**kwargs)
data.update({
'object_navigation_links': menu_setup.resolve(context=RequestContext(self.request)),
'title': _('Setup items'),
})
return data
class ToolsListView(TemplateView): class ToolsListView(TemplateView):
@@ -441,18 +443,23 @@ class ToolsListView(TemplateView):
return data return data
def home(request): class HomeView(TemplateView):
document_search = SearchModel.get('documents.Document') template_name = 'appearance/home.html'
context = { def get_context_data(self, **kwargs):
'query_string': request.GET, data = super(HomeView, self).get_context_data(**kwargs)
'hide_links': True, data.update({
'search_results_limit': 100, 'search_terms': self.request.GET.get('q'),
'missing_list': [item for item in MissingItem.get_all() if item.condition()], 'hide_links': True,
} 'search_results_limit': 100,
'missing_list': [item for item in MissingItem.get_all() if item.condition()],
})
return data
if request.GET: def get(self, request, *args, **kwargs):
queryset, ids, timedelta = document_search.search(request.GET, request.user) context = self.get_context_data(**kwargs)
queryset, ids, timedelta = SearchModel.get('documents.Document').search(request.GET, request.user)
# Update the context with the search results # Update the context with the search results
context.update({ context.update({
@@ -461,7 +468,7 @@ def home(request):
'title': _('Results'), 'title': _('Results'),
}) })
return render_to_response('appearance/home.html', context, context_instance=RequestContext(request)) return self.render_to_response(context)
def maintenance_menu(request): def maintenance_menu(request):