# HG changeset patch
# User cavaliet
# Date 1378385580 -7200
# Node ID cc7149ca6863bd7e5d746cc4240c462ec74f19a2
# Parent  33a413910b755f81356b0bbea45b8c172ab1f64b
good place for login_required

diff -r 33a413910b75 -r cc7149ca6863 src/p4l/urls.py
--- a/src/p4l/urls.py	Thu Sep 05 13:25:32 2013 +0200
+++ b/src/p4l/urls.py	Thu Sep 05 14:53:00 2013 +0200
@@ -1,6 +1,7 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.contrib.auth import urls as auth_urls
+from django.contrib.auth.decorators import login_required
 from p4l.views import RecordListView, RecordDetailView, RecordEditView
 
 js_info_dict = {
@@ -11,10 +12,10 @@
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^$', RecordListView.as_view(), name='p4l_home'),
+    url(r'^$', login_required(RecordListView.as_view()), name='p4l_home'),
     url(r'^auth/', include(auth_urls)),
-    url(r'^record/view/(?P<slug>\w+)$', RecordDetailView.as_view(), name='p4l_record_view'),
-    url(r'^record/edit/(?P<slug>\w+)$', RecordEditView.as_view(), name='p4l_record_edit'),
+    url(r'^record/view/(?P<slug>\w+)$', login_required(RecordDetailView.as_view()), name='p4l_record_view'),
+    url(r'^record/edit/(?P<slug>\w+)$', login_required(RecordEditView.as_view()), name='p4l_record_edit'),
     url(r'^api/', include('p4l.api.urls')),
 
     url(r'^i18n/', include('django.conf.urls.i18n')),
diff -r 33a413910b75 -r cc7149ca6863 src/p4l/views.py
--- a/src/p4l/views.py	Thu Sep 05 13:25:32 2013 +0200
+++ b/src/p4l/views.py	Thu Sep 05 14:53:00 2013 +0200
@@ -6,7 +6,6 @@
 '''
 
 from django.conf import settings
-from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 from django.views.generic import ListView, DetailView
 from p4l.forms import RecordFilterForm
@@ -14,8 +13,6 @@
 from p4l.utils import get_labels_for_uris
 import json
 import logging
-from p4l.semantictree.forms.forms import SubjectForm
-from django.utils.safestring import mark_safe
 
 
 logger = logging.getLogger(__name__)
@@ -27,10 +24,6 @@
     template_name = "p4l/p4l_home.html"
     form_class = RecordFilterForm
     
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(RecordListView, self).dispatch(*args, **kwargs)
-    
     def get_context_data(self, **kwargs):
         context = ListView.get_context_data(self, **kwargs)
         context['filter_form'] = self.form_class()
@@ -56,10 +49,6 @@
     template_name = "p4l/p4l_record_view.html"
     slug_field = "identifier"
     
-    @method_decorator(login_required)
-    def dispatch(self, *args, **kwargs):
-        return super(RecordDetailView, self).dispatch(*args, **kwargs)
-    
     def get_context_data(self, **kwargs):
         context = DetailView.get_context_data(self, **kwargs)
         # We get the language, "fr" by default
@@ -168,7 +157,7 @@
 WHERE {
     ?uri a skos:Collection ;
     skos:inScheme <http://skos.um.es/unescothes/CS000> ;    
-    rdfs:label ?label .
+    skos:prefLabel|rdfs:label ?label .
     FILTER (lang(?label) = ?language). 
     FILTER NOT EXISTS { [skos:member ?uri] }
 }