Skip to content

Commit

Permalink
Merge branch 'feature/replace_frontendadmin' of github.com:servee/ser…
Browse files Browse the repository at this point in the history
…vee into feature/replace_frontendadmin
  • Loading branch information
kkellydesign committed Mar 25, 2011
2 parents 0c9ce7b + 848ca25 commit 25b5265
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion servee/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION = (0, 6, 0, "a", 1) # following PEP 386
DEV_N = "9"
DEV_N = "10"

# cribbed from pinax
# https://github.com/pinax/pinax/raw/master/LICENSE
Expand Down
3 changes: 1 addition & 2 deletions servee/frontendadmin/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@ def response_change(self, request, obj):

# we want to override the default save case in the frontend
ref = request.META.get("HTTP_REFERER")
print ref.find("/servee/")
if ref and (ref.find("/servee/") == -1):
if request.is_ajax():
return HttpResponse("<script type='text/javascript'>window.location.reload(true);</script>")
elif request.FILES:
else:
return HttpResponseRedirect(ref)

# fallback to normal functionality
Expand Down

0 comments on commit 25b5265

Please sign in to comment.