Merge branch 'master' into Develop

# Conflicts:
#	cps/web.py
#	cps/worker.py
This commit is contained in:
Ozzieisaacs
2019-04-14 18:18:39 +02:00
5 changed files with 21 additions and 12 deletions
+3 -2
View File
@@ -65,11 +65,12 @@ $(function() {
});
});
/*function TableActions (value, row, index) {
/* Function for deleting domain restrictions */
function TableActions (value, row, index) {
return [
"<a class=\"danger remove\" data-toggle=\"modal\" data-target=\"#DeleteDomain\" data-domain-id=\"" + row.id
+ "\" title=\"Remove\">",
"<i class=\"glyphicon glyphicon-trash\"></i>",
"</a>"
].join("");
}*/
}