mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toaster: newcustomimage_modal add frontend name validation

Browse Source 
Add front end handling of validation response from create new
CustomImageRecipe api.

(Bitbake rev: eff66b502df8e001cd0abc25bcbd742687169619)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood
2016-02-02 17:46:31 +00:00
committed by Richard Purdie
parent cb6d290d0b
commit 0fee829932
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/toastergui/static/js/newcustomimage_modal.js
+32 -5
View File
@@ -5,24 +5,51 @@ function newCustomImageModalInit(){
var newCustomImgBtn = $("#create-new-custom-image-btn");
var imgCustomModal = $("#new-custom-image-modal");
var invalidNameHelp = $("#invalid-name-help");
var nameInput = imgCustomModal.find('input');
var invalidMsg = "Image names cannot contain spaces or capital letters. The only allowed special character is dash (-).";
newCustomImgBtn.click(function(e){
e.preventDefault();
var name = imgCustomModal.find('input').val();
var baseRecipeId = imgCustomModal.data('recipe');
if (name.length > 0) {
imgCustomModal.modal('hide');
libtoaster.createCustomRecipe(name, baseRecipeId, function(ret) {
if (nameInput.val().length > 0) {
libtoaster.createCustomRecipe(nameInput.val(), baseRecipeId,
function(ret) {
if (ret.error !== "ok") {
console.warn(ret.error);
if (ret.error === "invalid-name") {
showError(invalidMsg);
} else if (ret.error === "already-exists") {
showError("An image with this name already exists. Image names must be unique.");
}
} else {
imgCustomModal.modal('hide');
window.location.replace(ret.url + '?notify=new');
}
});
}
});
function showError(text){
invalidNameHelp.text(text);
invalidNameHelp.show();
}
nameInput.on('keyup', function(){
if (nameInput.val().length === 0){
newCustomImgBtn.prop("disabled", true);
return
}
if (nameInput.val().search(/[^a-z|0-9|-]/) != -1){
showError(invalidMsg);
newCustomImgBtn.prop("disabled", true);
} else {
console.warn("TODO No name supplied");
invalidNameHelp.hide();
newCustomImgBtn.prop("disabled", false);
}
});
}
bitbake/lib/toaster/toastergui/templates/newcustomimage_modal.html
+3 -4
View File
@@ -22,12 +22,11 @@
<span class="help-block span8">Image names must be unique. They should not contain spaces or capital letters, and the only allowed special character is dash (-).<p></p>
</span></div>
<div class="control-group controls">
<input type="text" class="huge span5" placeholder="Type the name, something like 'core-image-myimage'">
<span class="help-block" style="display:none">Image names cannot contain spaces or capital letters. The only allowed special character is dash (-)</span>
<span class="help-block" style="display: none">An image with this name already exists. Image names must be unique: try a different one.</span>
<input type="text" class="huge span5" placeholder="Type the name, something like 'core-image-myimage'" required>
<span class="help-block error" id="invalid-name-help" style="display:none"></span>
</div>
</div>
<div class="modal-footer">
<a href="#" id="create-new-custom-image-btn" class="btn btn-primary btn-large" data-original-title="" title="">Create custom image</a>
<button id="create-new-custom-image-btn" class="btn btn-primary btn-large" data-original-title="" title="" disabled>Create custom image</button>
</div>
</div>