bitbake: toaster: importlayer Add git revision typeahead to that input field
Add the front end mechanism to load the typeahead for the git revision field on importing a layer. Also fix one indentation issue and update the js test. (Bitbake rev: 28114be42174095b812a93d4b5a0e01e953d74f8) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
97ff2c0091
commit
23ad2a8ca0
|
@ -210,7 +210,6 @@ fieldset.fields-apart-from-layer-name { margin-top: 20px; }
|
||||||
#import-layer-name,
|
#import-layer-name,
|
||||||
#layer-subdir { width: 20%; }
|
#layer-subdir { width: 20%; }
|
||||||
#layer-git-repo-url { width: 40%; }
|
#layer-git-repo-url { width: 40%; }
|
||||||
#layer-git-ref { width: 32%; }
|
|
||||||
#local-dir-path { width: 45%; }
|
#local-dir-path { width: 45%; }
|
||||||
#layer-dependency { width: 16em; }
|
#layer-dependency { width: 16em; }
|
||||||
#layer-deps-list { margin-top: 0; }
|
#layer-deps-list { margin-top: 0; }
|
||||||
|
|
|
@ -45,7 +45,7 @@ function importLayerPageInit (ctx) {
|
||||||
function(layer) {
|
function(layer) {
|
||||||
if (layer.results.length > 0) {
|
if (layer.results.length > 0) {
|
||||||
currentLayerDepSelection = layer.results[0];
|
currentLayerDepSelection = layer.results[0];
|
||||||
layerDepBtn.click();
|
layerDepBtn.click();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -333,19 +333,36 @@ function importLayerPageInit (ctx) {
|
||||||
check_form();
|
check_form();
|
||||||
});
|
});
|
||||||
|
|
||||||
/* Have a guess at the layer name */
|
/* Setup 'blank' typeahead */
|
||||||
|
libtoaster.makeTypeahead(gitRefInput,
|
||||||
|
ctx.xhrGitRevTypeAheadUrl,
|
||||||
|
{ git_url: null }, function(){});
|
||||||
|
|
||||||
|
|
||||||
vcsURLInput.focusout(function (){
|
vcsURLInput.focusout(function (){
|
||||||
|
if (!$(this).val())
|
||||||
|
return;
|
||||||
|
|
||||||
/* If we a layer name specified don't overwrite it or if there isn't a
|
/* If we a layer name specified don't overwrite it or if there isn't a
|
||||||
* url typed in yet return
|
* url typed in yet return
|
||||||
*/
|
*/
|
||||||
if (layerNameInput.val() || !$(this).val())
|
if (!layerNameInput.val() && $(this).val().search("/")){
|
||||||
return;
|
|
||||||
|
|
||||||
if ($(this).val().search("/")){
|
|
||||||
var urlPts = $(this).val().split("/");
|
var urlPts = $(this).val().split("/");
|
||||||
|
/* Add a suggestion of the layer name */
|
||||||
var suggestion = urlPts[urlPts.length-1].replace(".git","");
|
var suggestion = urlPts[urlPts.length-1].replace(".git","");
|
||||||
layerNameInput.val(suggestion);
|
layerNameInput.val(suggestion);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Now actually setup the typeahead properly with the git url entered */
|
||||||
|
gitRefInput._typeahead('destroy');
|
||||||
|
|
||||||
|
libtoaster.makeTypeahead(gitRefInput,
|
||||||
|
ctx.xhrGitRevTypeAheadUrl,
|
||||||
|
{ git_url: $(this).val() },
|
||||||
|
function(selected){
|
||||||
|
gitRefInput._typeahead("close");
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function radioDisplay() {
|
function radioDisplay() {
|
||||||
|
|
|
@ -144,7 +144,7 @@ QUnit.test("Make typeaheads", function(assert){
|
||||||
/* Page init functions */
|
/* Page init functions */
|
||||||
|
|
||||||
QUnit.test("Import layer page init", function(assert){
|
QUnit.test("Import layer page init", function(assert){
|
||||||
assert.throws(importLayerPageInit());
|
assert.throws(importLayerPageInit({ xhrGitRevTypeAheadUrl: "url" }));
|
||||||
});
|
});
|
||||||
|
|
||||||
QUnit.test("Project page init", function(assert){
|
QUnit.test("Project page init", function(assert){
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
$(document).ready(function (){
|
$(document).ready(function (){
|
||||||
var ctx = {
|
var ctx = {
|
||||||
xhrLayerUrl : "{% url 'xhr_layer' project.id %}",
|
xhrLayerUrl : "{% url 'xhr_layer' project.id %}",
|
||||||
|
xhrGitRevTypeAheadUrl : "{% url 'xhr_gitrevtypeahead' %}",
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -112,8 +113,10 @@
|
||||||
Git revision
|
Git revision
|
||||||
<span class="glyphicon glyphicon-question-sign get-help" title="You can provide a Git branch, a tag or a commit SHA as the revision"></span>
|
<span class="glyphicon glyphicon-question-sign get-help" title="You can provide a Git branch, a tag or a commit SHA as the revision"></span>
|
||||||
</label>
|
</label>
|
||||||
<input type="text" class="form-control" id="layer-git-ref" required>
|
<span style="display: block">
|
||||||
|
<input type="text" class="form-control" id="layer-git-ref" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" required>
|
||||||
<span class="help-inline" style="display:none;" id="invalid-layer-revision-hint"></span>
|
<span class="help-inline" style="display:none;" id="invalid-layer-revision-hint"></span>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue