mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 21:42:27 +00:00
relative possition for restapi | cssclass attribute fix | fix to order
This commit is contained in:
1 parent
e29a8b92e4
commit
550cee85c2
2 files changed
+4
-19
No files matched your search
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
-->
|
||||
<?jelly escape-by-default='true'?>
|
||||
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
|
||||
<l:layout title="${it.displayName} Config" cssClass="main-panel-only" norefresh="true" permission="${it.EXTENDED_READ}">
|
||||
<l:layout title="${it.displayName} Config" cssclass="main-panel-only" norefresh="true" permission="${it.EXTENDED_READ}">
|
||||
<f:breadcrumb-config-outline />
|
||||
<l:main-panel>
|
||||
<l:js src="jsbundles/config-scrollspy.js" />
|
||||
|
||||
@@ -3,7 +3,7 @@ var $ = require('jquery-detached').getJQuery();
|
||||
|
||||
var getItems = function(root){
|
||||
var d = $.Deferred();
|
||||
$.get(root+'/categories?depth=3').done(
|
||||
$.get('categories?depth=3').done(
|
||||
function(data){
|
||||
d.resolve(data);
|
||||
}
|
||||
@@ -46,8 +46,6 @@ $.when(getItems(jRoot)).done(function(data){
|
||||
|
||||
$subBtn = $('#bottom-sticker .yui-submit-button');
|
||||
|
||||
checkFormReady();
|
||||
|
||||
$subBtn.on('click',function(e){
|
||||
var $this = $(this).addClass('yui-button-disabled yui-submit-button-disabled')
|
||||
.find('button')
|
||||
@@ -106,24 +104,11 @@ $.when(getItems(jRoot)).done(function(data){
|
||||
return {selected:selected,named:named};
|
||||
}
|
||||
if(checkItems().selected && checkItems().named){
|
||||
$($subBtn.next('.cover')).remove();
|
||||
$subBtn.removeClass('yui-button-disabled').find('button').removeAttr('disabled');
|
||||
}
|
||||
else{
|
||||
$subBtn.addClass('yui-button-disabled').find('button').attr('disabled','disabled');
|
||||
$('<div class="cover" />').insertAfter($subBtn)
|
||||
.click(function(){
|
||||
var missingText = [];
|
||||
if(!checkItems().named){
|
||||
$name.addClass('no-val').focus();
|
||||
missingText.push('item name');
|
||||
}
|
||||
if(!checkItems().selected){
|
||||
$form.addClass('no-select');
|
||||
missingText.push('item type selection');
|
||||
}
|
||||
alert('Required selections are missing: '+ (missingText.join(', ')));
|
||||
});
|
||||
$('<div class="coverz" />').insertAfter($subBtn);
|
||||
}
|
||||
},10);
|
||||
}
|
||||
@@ -166,7 +151,7 @@ $.when(getItems(jRoot)).done(function(data){
|
||||
function sortByOrder(a, b) {
|
||||
var aOrder = a.weight;
|
||||
var bOrder = b.weight;
|
||||
return ( (aOrder < bOrder) ? -1 : ( (aOrder === bOrder) ? 0 : 1));
|
||||
return ( (aOrder < bOrder) ? -1 : ( (aOrder === bOrder) ? 1 : 0));
|
||||
}
|
||||
return itemTypes.sort(sortByOrder);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user