hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 20:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1578 Checks field source validation

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-08 16:26:22 +01:00
committed by Romain Neutron
parent 35b20ba9f2
commit b24b4fdb00
2 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
www/scripts/apps/admin/fields/views/edit.js
View File

@@ -134,38 +134,43 @@ define([
return this;
},
tagFieldChangedAction: function(e) {
var $this = this;
var fieldTag = $(e.target);
var fieldTagId = fieldTag.attr("id");
var fieldTagValue = fieldTag.val();
var notValid = "" === fieldTagValue;
// check for format tag
if (notValid) {
fieldTag
.closest(".control-group")
.addClass("error")
.find(".help-block")
.empty()
.append(i18n.t("validation_tag_invalid"));
// add error
AdminFieldApp.errorManager.addModelFieldError(new Error(
this.model, fieldTagId, i18n.t("validation_tag_invalid")
));
} else if (fieldTag.closest(".control-group").hasClass("error")) {
// remove error
AdminFieldApp.errorManager.removeModelFieldError(
this.model, fieldTagId
);
var onFieldValid = function() {
if (fieldTag.closest(".control-group").hasClass("error")) {
// remove error
AdminFieldApp.errorManager.removeModelFieldError(
$this.model, fieldTagId
);
fieldTag
.closest(".control-group")
.removeClass("error")
.find(".help-block")
.empty();
fieldTag
.closest(".control-group")
.removeClass("error")
.find(".help-block")
.empty();
} else {
$this.fieldChangedAction(e);
}
}
if (!notValid) {
this.fieldChangedAction(e);
if ("" !== fieldTagValue) {
var jqxhr = $.get( "/admin/fields/tags/"+fieldTagValue, onFieldValid).fail(function() {
fieldTag
.closest(".control-group")
.addClass("error")
.find(".help-block")
.empty()
.append(i18n.t("validation_tag_invalid"));
// add error
AdminFieldApp.errorManager.addModelFieldError(new Error(
$this.model, fieldTagId, i18n.t("validation_tag_invalid")
));
});
} else {
onFieldValid();
}
},
deleteAction: function() {