Remove the ability to add multiple jobset input alternatives

[?]

Sep 25, 2014, 2:43 PM

OK4P3AMKXIBSUNL4ABLFKTK3UBFLINDINBPZVP5OSHLRSV44BICAC

Dependencies

[2] VJFLX7B6 Fix rendering of jobset inputs
[3] F7NHYL4C Maintain the order of the input alternatives
[4] VZX6HJ3I Fix jobset input handling in the API
[5] GTXYNFUK Merge branch 'master' into persona
[6] Z52T2BC4 Support passing a jobset evaluation as an input
[7] 2G63HKCH Fix some wellformedness issues
[8] GEADFVZ5 hydra-queue-runner: Improved scheduling
[9] LMETCA7G Cleanup
[10] PCKLFRT5 Support push notification of repository changes
[11] MNKXBLNC Return 410 Gone (rather than 500) if an output is no longer available
[12] OX6NYJDV Split viewing and editing a jobset
[13] OOQ2D3KC * Refactoring: move fetchInput out of hydra_scheduler into a separate
[14] RSEGBU6C Hydra/20: Jobset clone feature
[15] N45RZUQ6 Reduce I/O in build listings by only fetching required columns
[16] ODNCGFQ5 * Improved the navigation bar: don't include all projects (since that
[17] HQGXL4MX Add validation for project and jobset names
[18] 2GUW2QBC Fix adding jobset inputs
[19] NIX2TKYV Use redirectJSON
[20] ZFEN2MAO Simplify jobset cloning
[21] LHBSOI2D Fix adding jobset inputs
[22] 2CZSW5S5 Don't redirect to /login if authentication is required
[23] LYVUXIGT Clean up the authorization code a bit
[24] EWMC72QY edit-jobset.tt: Retain old inputs with dashes in their name
[25] LSZLZHJY Allow users to edit their own settings
[26] K3HODXGH Check all inputs for blame but only email selected inputs
[27] RQI3GRC6 Enable setting checkresponsible in the edit jobset form
[28] ZCTQCN3E Use inputTypes from plugins to determine valid input types
[29] XJRJ4J7M Add user registration
[30] UMFB2767 Hydra/64: Leaving number of builds empty gives DBIx error
[31] TQVKZQUG Use the REST API in the web interface for editing jobsets
[32] LZVO64YG Merge in the first bits of the API work
[33] 5NO7NCKT * Refactoring.
[34] DEPAYN5W Fix adding jobset inputs
[35] RPTSGIRC Eliminate duplicate getPreviousBuild functions
[*] 3HZY24CX * Make jobsets viewable under
[*] LBNVQXUB * Build the /build stuff in a separate controller.

Change contents

replacement in src/lib/Hydra/Controller/Jobset.pm at line 247

[4.166]→[4.166:209](∅→∅)

my $values = $inputData->{values};

[4.166]

[4.209]

my $value = $inputData->{value};
replacement in src/lib/Hydra/Controller/Jobset.pm at line 253

[7.1]→[7.0:114](∅→∅),[7.114]→[4.289:343](∅→∅)

my $input = $jobset->jobsetinputs->create({
name => $name,
type => $type,
emailresponsible => $emailresponsible

[7.1]

[7.208]

my $input = $jobset->jobsetinputs->create(
{ name => $name,
type => $type,
emailresponsible => $emailresponsible
replacement in src/lib/Hydra/Controller/Jobset.pm at line 259

[7.187]→[7.779:891](∅→∅),[7.891]→[7.3984:4007](∅→∅),[7.3984]→[7.3984:4007](∅→∅),[7.4007]→[7.892:930](∅→∅),[7.930]→[6.616:680](∅→∅),[6.680]→[7.4272:4365](∅→∅),[7.987]→[7.4272:4365](∅→∅),[7.2661]→[7.4272:4365](∅→∅),[7.4272]→[7.4272:4365](∅→∅)

# Set the values for this input.
my @values = ref($values) eq 'ARRAY' ? @{$values} : ($values);
my $altnr = 0;
foreach my $value (@values) {
$value = checkInputValue($c, $name, $type, $value);
$input->jobsetinputalts->create({altnr => $altnr++, value => $value});
}

[7.187]

[7.4365]

$value = checkInputValue($c, $name, $type, $value);
$input->jobsetinputalts->create({altnr => 0, value => $value});
replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 25

[7.4158]→[7.3453:3553](∅→∅),[7.1657]→[7.3453:3553](∅→∅)

$pathCompRE $relPathRE $relNameRE $projectNameRE $jobsetNameRE $jobNameRE $systemRE $userNameRE

[7.4158]

[7.547]

$pathCompRE $relPathRE $relNameRE $projectNameRE $jobsetNameRE $jobNameRE $systemRE $userNameRE $inputNameRE
edit in src/lib/Hydra/Helper/CatalystUtils.pm at line 103

[7.603]→[5.1:1](∅→∅)
edit in src/lib/Hydra/Helper/CatalystUtils.pm at line 238

[7.3610]

[7.1658]

Readonly our $inputNameRE => "(?:[A-Za-z_][A-Za-z0-9-_]*)";
edit in src/root/edit-jobset.tt at line 4

[7.2186]→[7.520:521](∅→∅),[7.520]→[7.520:521](∅→∅),[7.521]→[2.0:33](∅→∅),[2.33]→[7.548:691](∅→∅),[7.548]→[7.548:691](∅→∅),[7.691]→[7.771:850](∅→∅),[7.850]→[7.777:796](∅→∅),[7.777]→[7.777:796](∅→∅)

[% BLOCK renderJobsetInputAlt %]
<button type="button" class="btn btn-warning" onclick='$(this).parents(".inputalt").remove()'><i class="icon-trash icon-white"></i></button>
<input type="text" [% HTML.attributes(value => alt.value, name => name) %]/>
<br />
[% END %]
edit in src/root/edit-jobset.tt at line 9

[7.1046]

[7.851]

</td>
<td>
replacement in src/root/edit-jobset.tt at line 16

[7.1281]→[7.1281:1328](∅→∅),[7.1328]→[3.0:96](∅→∅),[3.96]→[7.1377:1409](∅→∅),[7.1377]→[7.1377:1409](∅→∅),[7.1409]→[2.65:142](∅→∅),[2.142]→[7.1480:1496](∅→∅),[7.1480]→[7.1480:1496](∅→∅)

<td class="inputalts" id="[% baseName %]">
[% FOREACH alt IN input.search_related('jobsetinputalts', {}, { order_by => 'altnr' }) %]
<span class="inputalt">
[% INCLUDE renderJobsetInputAlt alt=alt name="$baseName-values" %]
</span>

[7.1281]

[7.1496]

<td id="[% baseName %]">
[% alt = input.search_related('jobsetinputalts', {altnr => 0}) %]
<input type="text" [% HTML.attributes(value => alt.value, id => "$baseName-value", name => "$baseName-value") %]/>
[% IF input.jobsetinputalts_rs.count > 1 %]
<div class="alert alert-warning">Warning: This input had more
than one value. This is no longer supported. The additional
values have been removed.</div>
edit in src/root/edit-jobset.tt at line 24

[7.1512]→[7.1512:1668](∅→∅)

[% IF edit %]<button type="button" class="add-inputalt btn btn-success" onclick='return false'><i class="icon-plus icon-white"></i></button>[% END %]
replacement in src/root/edit-jobset.tt at line 34

[7.1788]→[7.1458:1547](∅→∅)

<tr><th>Input name</th><th>Type</th><th>Values</th><th>Notify committers</th></tr>

[7.1788]

[7.1851]

<tr><th></th><th>Input name</th><th>Type</th><th>Value</th><th>Notify committers</th></tr>
edit in src/root/edit-jobset.tt at line 151

[7.4830]→[7.33:102](∅→∅),[7.102]→[2.409:456](∅→∅),[2.456]→[7.4925:4934](∅→∅),[7.4925]→[7.4925:4934](∅→∅)

<tt class="inputalt" id="inputalt-template" style="display: none">
[% INCLUDE renderJobsetInputAlt alt=alt %]
</tt>
edit in src/root/edit-jobset.tt at line 162

[7.2399]

[7.1548]

$("#input-template-value", x).attr("name", newid + "-value");
edit in src/root/edit-jobset.tt at line 166

[7.2468]→[7.5663:5671](∅→∅),[7.5663]→[7.5663:5671](∅→∅),[7.5671]→[7.2469:2689](∅→∅)

});

$(".add-inputalt").click(function() {
var x = $("#inputalt-template").clone(true).insertBefore($(this)).attr("id", "").show();
$("input", x).attr("name", x.parents(".inputalts").attr("id") + "-values");
replacement in src/root/edit-jobset.tt at line 173

[4.463]→[4.463:515](∅→∅)

for (var i = 0; i < formElements.length; i++) {

[4.463]

[4.515]

for (var i = 0; formElements.length > i; i++) {
replacement in src/root/edit-jobset.tt at line 182

[4.752]→[4.752:823](∅→∅)

if (baseName === "template") {
continue;
}

[4.752]

[4.823]

if (baseName === "template") continue;
replacement in src/root/edit-jobset.tt at line 184

[4.824]→[4.824:861](∅→∅)

if (!(baseName in inputs)) {

[4.824]

[4.861]

if (!(baseName in inputs))
edit in src/root/edit-jobset.tt at line 186

[4.896]→[4.896:906](∅→∅)

}
replacement in src/root/edit-jobset.tt at line 187

[4.907]→[4.907:939](∅→∅)

if (param === "name") {

[4.907]

[4.939]

if (param === "name")
replacement in src/root/edit-jobset.tt at line 189

[4.995]→[4.995:1012](∅→∅)

} else {

[4.995]

[4.1012]

else
edit in src/root/edit-jobset.tt at line 191

[4.1062]→[4.1062:1072](∅→∅)

}