Skip to content

Commit

Permalink
Merge pull request #1107 from onaio/filter-deleted-forms
Browse files Browse the repository at this point in the history
Filter deleted forms in classic web views
  • Loading branch information
ukanga authored Aug 28, 2017
2 parents 10dbd7d + 7515502 commit 6f65cc7
Show file tree
Hide file tree
Showing 8 changed files with 813 additions and 610 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$

# Good variable names which should always be accepted, separated by a comma
good-names=e,i,j,k,v,ex,Run,_
good-names=e,f,i,j,k,v,z,ex,Run,_

# Include a hint for the correct naming format with invalid-name
include-naming-hint=no
Expand Down
2 changes: 1 addition & 1 deletion onadata/apps/logger/models/xform.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def get_forms_shared_with_user(user):
xforms = XForm.objects.filter(
pk__in=user.xformuserobjectpermission_set.values_list(
'content_object_id', flat=True).distinct(),
downloadable=True)
downloadable=True, deleted_at__isnull=True)

return xforms.exclude(user=user).select_related('user')

Expand Down
Loading

0 comments on commit 6f65cc7

Please sign in to comment.