antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 9 Projects Releases 9 Wiki Activity Actions

fix: too complicated deletion of jobs

Browse source
This commit is contained in:
Tobi Schäfer 2018-05-05 16:46:30 +02:00
parent fb654a6c46
commit 6a62937005
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/Admin/$Admin.skin
View file

@ -381,7 +381,11 @@
<td><% gettext <% item.method %> | titleize %></td> <td><% gettext <% item.method %> | titleize %></td>
<td><a href='<% item.target.href %>'><% item.target.name %></a></td> <td><a href='<% item.target.href %>'><% item.target.name %></a></td>
<td><% item.user.name %></td> <td><% item.user.name %></td>
<td class='uk-text-right'><% admin.link <% item.target.id prefix='job?delete=' %> "<i class='uk-icon-trash-o'></i>" %></td> <td class='uk-text-right'><% item.name %>
<a href='<% admin.href job %>?name=<% item.name %>&amp;<% item.target.type %>&amp;id=<% item.target.id %>'>
<i class='uk-icon-trash-o'></i>
</a>
</td>
</tr> </tr>
<% #blockedSite %> <% #blockedSite %>

5
code/Admin/Admin.js
View file

@ -542,9 +542,8 @@ Admin.prototype.jobs_action = function() {
}; };
Admin.prototype.job_action = function () { Admin.prototype.job_action = function () {
var site = Site.getById(req.data.delete); if (req.data.name) {
if (site && site.job) { const job = new Admin.Job(req.data.name);
var job = new Admin.Job(site.job);
job.remove(); job.remove();
} }
return res.redirect(req.data.http_referer); return res.redirect(req.data.http_referer);