diff --git a/forms.py b/forms.py index 9468f3008..d03d68f94 100755 --- a/forms.py +++ b/forms.py @@ -138,7 +138,7 @@ def clean_bid(self): raise forms.ValidationError( "This bid not open for new donations anymore.") except Exception as e: - raise forms.ValidationError("Bid does not exist.") + raise forms.ValidationError("Bid does not exist or is closed.") return bid def clean_amount(self): diff --git a/static/adminprocessing.js b/static/adminprocessing.js index c1e1898dc..c4419e009 100644 --- a/static/adminprocessing.js +++ b/static/adminprocessing.js @@ -129,7 +129,7 @@ function makeEditButton(row, obj, text, resultText, fields) { if (status == 200) { $(row).children(".statuscell").html(resultText); - values = eval(response)[0]; + values = JSON.parse(response)[0]; for (var field in values['fields']) { diff --git a/templates/admin/process_donations.html b/templates/admin/process_donations.html index 164bf13cb..7a7576763 100644 --- a/templates/admin/process_donations.html +++ b/templates/admin/process_donations.html @@ -192,7 +192,7 @@ "" + "").append(makeAnchor(asMoney(donation['fields']['amount']), trackerAPI.createAdminEditURL('donation', id)))); row.append($("").append(safeHtml(donation['fields']['comment']))); row.append($("").append(safeHtml(donation['fields']['modcomment']))); - row.append($("") .append(makeEditButton(row, donation, "Read", "Read on the Air", { readstate: "READ", commentstate: "APPROVED" })) .append(makeEditButton(row, donation, "Ignore", "Ignored", { readstate: "IGNORED", commentstate: "APPROVED" })) diff --git a/templates/base.html b/templates/base.html index 4e9c29e1d..b36c2edee 100644 --- a/templates/base.html +++ b/templates/base.html @@ -26,8 +26,7 @@