Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #452: user menu visibility #458

Merged
merged 1 commit into from
Jul 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cadasta/party/views/default.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.views import generic
from core.views import generic
import django.views.generic as base_generic
from django.core.urlresolvers import reverse
from jsonattrs.mixins import JsonAttrsMixin
from core.mixins import LoginPermissionRequiredMixin
Expand Down Expand Up @@ -69,7 +70,7 @@ def get_success_url(self):

class PartyResourcesAdd(LoginPermissionRequiredMixin,
mixins.PartyResourceMixin,
generic.edit.FormMixin,
base_generic.edit.FormMixin,
generic.DetailView):
template_name = 'party/resources_add.html'
form_class = AddResourceFromLibraryForm
Expand Down Expand Up @@ -137,7 +138,7 @@ class PartyRelationshipResourceNew(LoginPermissionRequiredMixin,

class PartyRelationshipResourceAdd(LoginPermissionRequiredMixin,
mixins.PartyRelationshipResourceMixin,
generic.edit.FormMixin,
base_generic.edit.FormMixin,
generic.DetailView):
template_name = 'party/relationship_resources_add.html'
form_class = AddResourceFromLibraryForm
Expand Down
5 changes: 3 additions & 2 deletions cadasta/resources/views/default.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.views import generic
from core.views import generic
import django.views.generic as base_generic
from core.views.mixins import ArchiveMixin

from core.mixins import LoginPermissionRequiredMixin
Expand All @@ -19,7 +20,7 @@ class ProjectResources(LoginPermissionRequiredMixin,

class ProjectResourcesAdd(LoginPermissionRequiredMixin,
ProjectResourceMixin,
generic.edit.FormMixin,
base_generic.edit.FormMixin,
generic.DetailView):
template_name = 'resources/project_add_existing.html'
form_class = AddResourceFromLibraryForm
Expand Down