nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 06:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup popup messages for add/update views

Browse Source
This commit is contained in:
Andrew Williams
2012-06-08 16:44:35 +01:00
parent 95f243c3f8
commit 16e1316ab2
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/eve_api/views/base.py
View File

@@ -36,17 +36,16 @@ class EVEAPICreateView(LoginRequiredMixin, CreateView):
try: try:
out = task.wait(10) out = task.wait(10)
except celery.exceptions.TimeoutError: except celery.exceptions.TimeoutError:
msg = "The addition of your API key is still processing, please check back in a minute or so." messages.info(self.request, "The addition of your API key is still processing, please check back in a minute or so.")
except DocumentRetrievalError: except DocumentRetrievalError:
msg = "An issue with the EVE API was encountered while adding your API, please try again later." messages.error(self.request, "An issue with the EVE API was encountered while adding your API, please try again later.")
except: except:
msg = "An unknown error was encountered while trying to add your API key, please try again later." messages.error(self.request, "An unknown error was encountered while trying to add your API key, please try again later.")
else: else:
if out: if out:
msg = "Key %d successfully added." % form.cleaned_data['api_user_id'] messages.success(self.request, "Key %d successfully added." % form.cleaned_data['api_user_id'])
else: else:
msg = "An issue was encountered while trying to import key %s, Please check that you are using the correct information and try again." % form.cleaned_data['api_user_id'] messages.error(self.request, "An issue was encountered while trying to import key %s, Please check that you are using the correct information and try again." % form.cleaned_data['api_user_id'])
messages.success(request, msg, fail_silently=True)
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())
def get_initial(self): def get_initial(self):
@@ -71,24 +70,20 @@ class EVEAPIUpdateView(LoginRequiredMixin, UpdateView):
try: try:
acc = task.wait(30) acc = task.wait(30)
except celery.exceptions.TimeoutError: except celery.exceptions.TimeoutError:
msg = "The addition of your API key is still processing, please check back in a minute or so." messages.info(self.request, "The addition of your API key is still processing, please check back in a minute or so.")
except DocumentRetrievalError: except DocumentRetrievalError:
msg = "An issue with the EVE API was encountered while adding your API, please try again later." messages.error(self.request, "An issue with the EVE API was encountered while adding your API, please try again later.")
except: except:
msg = "An unknown error was encountered while trying to add your API key, please try again later." messages.error(self.request, "An unknown error was encountered while trying to add your API key, please try again later.")
else: else:
#form.save()
if acc: if acc:
msg = "EVE API key %d successfully updated." % acc.api_user_id messages.success(self.request, "EVE API key %d successfully updated." % acc.api_user_id)
else: else:
messages.error(self.request, "An error was encountered while trying to update your API key, Please check your key and try again.", fail_silently=True) messages.error(self.request, "An error was encountered while trying to update your API key, Please check your key and try again.", fail_silently=True)
else: else:
if form.has_changed(): if form.has_changed():
acc = form.save() acc = form.save()
msg = "EVE API key %d successfully updated." % acc.api_user_id messages.success(self.request, "EVE API key %d successfully updated." % acc.api_user_id)
if msg:
messages.success(self.request, msg, fail_silently=True)
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())
@@ -135,7 +130,7 @@ class EVEAPIRefreshView(LoginRequiredMixin, SingleObjectMixin, View):
ret = [acc] ret = [acc]
return HttpResponse(serializers.serialize('json', ret), mimetype='application/javascript') return HttpResponse(serializers.serialize('json', ret), mimetype='application/javascript')
else: else:
messages.add_message(self.request, messages.INFO, "Key %s has been queued to be refreshed from the API" % acc.api_user_id) messages.info(self.request, "Key %s has been queued to be refreshed from the API" % acc.api_user_id)
return HttpResponseRedirect('/') return HttpResponseRedirect('/')