Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-13 06:34:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix delete domain entries

Browse Source 
Fix error handling smtp.authentication error
This commit is contained in:
Ozzieisaacs 2019-04-14 14:08:49 +02:00
parent a669eacde9
commit 436c2671d1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cps/static/js/table.js
View File

@ -65,11 +65,12 @@ $(function() {
}); });
}); });
/*function TableActions (value, row, index) { /* Function for deleting domain restrictions */
function TableActions (value, row, index) {
return [ return [
"<a class=\"danger remove\" data-toggle=\"modal\" data-target=\"#DeleteDomain\" data-domain-id=\"" + row.id "<a class=\"danger remove\" data-toggle=\"modal\" data-target=\"#DeleteDomain\" data-domain-id=\"" + row.id
+ "\" title=\"Remove\">", + "\" title=\"Remove\">",
"<i class=\"glyphicon glyphicon-trash\"></i>", "<i class=\"glyphicon glyphicon-trash\"></i>",
"</a>" "</a>"
].join(""); ].join("");
}*/ }

6
cps/worker.py
View File

@ -468,9 +468,9 @@ class WorkerThread(threading.Thread):
except (MemoryError) as e: except (MemoryError) as e:
self._handleError(u'Error sending email: ' + e.message) self._handleError(u'Error sending email: ' + e.message)
return None return None
except (smtplib.SMTPException) as e: except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
if hasattr(e, "smtp_error"): if hasattr(e, "smtp_error"):
text = e.smtp_error.replace("\n",'. ') text = e.smtp_error.decode('utf-8').replace("\n",'. ')
elif hasattr(e, "message"): elif hasattr(e, "message"):
text = e.message text = e.message
else: else:
@ -495,7 +495,6 @@ class WorkerThread(threading.Thread):
def _handleError(self, error_message): def _handleError(self, error_message):
web.app.logger.error(error_message) web.app.logger.error(error_message)
# self.queue[self.current]['status'] = STAT_FAIL
self.UIqueue[self.current]['stat'] = STAT_FAIL self.UIqueue[self.current]['stat'] = STAT_FAIL
self.UIqueue[self.current]['progress'] = "100 %" self.UIqueue[self.current]['progress'] = "100 %"
self.UIqueue[self.current]['runtime'] = self._formatRuntime( self.UIqueue[self.current]['runtime'] = self._formatRuntime(
@ -503,7 +502,6 @@ class WorkerThread(threading.Thread):
self.UIqueue[self.current]['message'] = error_message self.UIqueue[self.current]['message'] = error_message
def _handleSuccess(self): def _handleSuccess(self):
# self.queue[self.current]['status'] = STAT_FINISH_SUCCESS
self.UIqueue[self.current]['stat'] = STAT_FINISH_SUCCESS self.UIqueue[self.current]['stat'] = STAT_FINISH_SUCCESS
self.UIqueue[self.current]['progress'] = "100 %" self.UIqueue[self.current]['progress'] = "100 %"
self.UIqueue[self.current]['runtime'] = self._formatRuntime( self.UIqueue[self.current]['runtime'] = self._formatRuntime(