ajout des vues

This commit is contained in:
Benjamin Dauvergne 2017-07-12 13:02:23 +02:00
parent f894cb2b3c
commit 8cd954c8ba
2 changed files with 20 additions and 12 deletions

View File

@ -15,17 +15,21 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import patterns, url
from django.contrib.auth.decorators import login_required
from . import views
from authentic2.decorators import required
urlpatterns = patterns(
'',
url('^accounts/edit-core/$', views.edit_core, name='cut-edit-core'),
url('^accounts/edit-crown/$', views.edit_crown, name='cut-edit-crown'),
url('^manage/users/(?P<pk>\d+)/edit-core/$', views.manager_user_edit_core,
name='cut-manager-user-edit-core'),
url('^manage/users/(?P<pk>\d+)/actions-journal/$', views.user_actions_journal,
name='cut-manager-user-actions-journal'),
url('^manage/users/(?P<pk>\d+)/modifications-journal/$', views.user_modifications_journal,
name='cut-manager-user-modifications-journal'),
urlpatterns = required(
login_required, patterns(
'',
url('^accounts/edit-core/$', views.edit_core, name='cut-edit-core'),
url('^accounts/edit-crown/$', views.edit_crown, name='cut-edit-crown'),
url('^manage/users/(?P<pk>\d+)/edit-core/$', views.manager_user_edit_core,
name='cut-manager-user-edit-core'),
url('^manage/users/(?P<pk>\d+)/actions-journal/$', views.user_actions_journal,
name='cut-manager-user-actions-journal'),
url('^manage/users/(?P<pk>\d+)/modifications-journal/$', views.user_modifications_journal,
name='cut-manager-user-modifications-journal'),
)
)

View File

@ -91,7 +91,7 @@ class UserEditCoreView(UserEditView):
response = super(UserEditCoreView, self).form_valid(form)
if not form.instance.attributes.validated:
models.Journal.objects.create(
author=self.request.user,
actor=self.request.user,
subject=self.object,
message='validation du compte')
form.instance.attributes.validated = True
@ -100,7 +100,7 @@ class UserEditCoreView(UserEditView):
messages.info(self.request, u'Le compte a été validé.')
else:
models.Journal.objects.create(
author=self.request.user,
actor=self.request.user,
subject=self.object,
message='modification des données cœur')
messages.info(self.request, u'Les données cœur ont été modifié.')
@ -113,6 +113,8 @@ class UserActionsJournal(SimpleSubTableView):
model = get_user_model()
table_class = tables.UserActionsTable
template_name = 'authentic2/cut_manager_user_actions_journal.html'
permissions = ['custom_user.view_user']
filter_table_by_perm = False
def get_table_queryset(self):
return self.object.actor_journal.all()
@ -124,6 +126,8 @@ class UserModificationsJournal(SimpleSubTableView):
model = get_user_model()
table_class = tables.UserModificationsTable
template_name = 'authentic2/cut_manager_user_modifications_journal.html'
permissions = ['custom_user.view_user']
filter_table_by_perm = False
def get_table_queryset(self):
return self.object.subject_journal.all()