Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Show error messages when adding permalinks in the admin UI (#12545) 

Also, check for uniqueness of permalinks before attempting to save.
This commit is contained in:
Daniel Waterworth 2021-03-29 13:36:59 -05:00 committed by GitHub
parent c89f97aafe
commit 70970bb791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/addon/components/permalink-form.js
View File

@ -69,9 +69,13 @@ export default Component.extend({
this.set("formSubmitted", false); this.set("formSubmitted", false);
let error; let error;
if (e.responseJSON && e.responseJSON.errors) { if (
e.jqXHR &&
e.jqXHR.responseJSON &&
e.jqXHR.responseJSON.errors
) {
error = I18n.t("generic_error_with_reason", { error = I18n.t("generic_error_with_reason", {
error: e.responseJSON.errors.join(". "), error: e.jqXHR.responseJSON.errors.join(". "),
}); });
} else { } else {
error = I18n.t("generic_error"); error = I18n.t("generic_error");

2
app/models/permalink.rb
View File

@ -8,6 +8,8 @@ class Permalink < ActiveRecord::Base
before_validation :normalize_url before_validation :normalize_url
validates :url, uniqueness: true
class Normalizer class Normalizer
attr_reader :source attr_reader :source