From f6d20fa8f37da61095cb5bc686dfcb5d2176be74 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 27 Aug 2013 18:08:50 -0400 Subject: [PATCH] [FIXED JENKINS-3107] Annotate the Advanced section if some fields are already customized. --- changelog.html | 3 +++ core/src/main/resources/lib/form/booleanRadio.jelly | 3 ++- core/src/main/resources/lib/form/combobox.jelly | 1 + core/src/main/resources/lib/form/editableComboBox.jelly | 1 + core/src/main/resources/lib/form/enum.jelly | 3 ++- core/src/main/resources/lib/form/hetero-radio.jelly | 1 + core/src/main/resources/lib/form/number.jelly | 1 + core/src/main/resources/lib/form/password.jelly | 1 + core/src/main/resources/lib/form/select.jelly | 1 + 9 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index d95da25520..1d9e566633 100644 --- a/changelog.html +++ b/changelog.html @@ -58,6 +58,9 @@ Upcoming changes
  • Deleting an external run did not immediately remove it from build list, leading to errors from log rotation. (issue 19377) +
  • + Annotate the Advanced section if some fields are already customized. + (issue 3107) diff --git a/core/src/main/resources/lib/form/booleanRadio.jelly b/core/src/main/resources/lib/form/booleanRadio.jelly index 7fe168cdb2..ea88952312 100644 --- a/core/src/main/resources/lib/form/booleanRadio.jelly +++ b/core/src/main/resources/lib/form/booleanRadio.jelly @@ -43,4 +43,5 @@ THE SOFTWARE. - \ No newline at end of file + + diff --git a/core/src/main/resources/lib/form/combobox.jelly b/core/src/main/resources/lib/form/combobox.jelly index 4f42e4f9a5..319998217d 100644 --- a/core/src/main/resources/lib/form/combobox.jelly +++ b/core/src/main/resources/lib/form/combobox.jelly @@ -52,4 +52,5 @@ THE SOFTWARE. autocomplete="off" class="combobox2 settings-input ${attrs.clazz}${attrs.checkUrl!=null ? ' validated' : ''}" name="${attrs.name ?: '_.'+attrs.field}" value="${attrs.value ?: instance[attrs.field]}" /> + diff --git a/core/src/main/resources/lib/form/editableComboBox.jelly b/core/src/main/resources/lib/form/editableComboBox.jelly index 8898fdb165..8689f25ff0 100644 --- a/core/src/main/resources/lib/form/editableComboBox.jelly +++ b/core/src/main/resources/lib/form/editableComboBox.jelly @@ -58,4 +58,5 @@ THE SOFTWARE. + diff --git a/core/src/main/resources/lib/form/enum.jelly b/core/src/main/resources/lib/form/enum.jelly index 6b949f397b..667f0c10d2 100644 --- a/core/src/main/resources/lib/form/enum.jelly +++ b/core/src/main/resources/lib/form/enum.jelly @@ -40,4 +40,5 @@ THE SOFTWARE. - \ No newline at end of file + + diff --git a/core/src/main/resources/lib/form/hetero-radio.jelly b/core/src/main/resources/lib/form/hetero-radio.jelly index 99bee7d485..80cca8d916 100644 --- a/core/src/main/resources/lib/form/hetero-radio.jelly +++ b/core/src/main/resources/lib/form/hetero-radio.jelly @@ -53,4 +53,5 @@ THE SOFTWARE. + diff --git a/core/src/main/resources/lib/form/number.jelly b/core/src/main/resources/lib/form/number.jelly index 680480bd88..6cfde1e20f 100644 --- a/core/src/main/resources/lib/form/number.jelly +++ b/core/src/main/resources/lib/form/number.jelly @@ -75,4 +75,5 @@ THE SOFTWARE. value="${attrs.value ?: instance[attrs.field] ?: attrs.default}" type="number" ATTRIBUTES="${attrs}" EXCEPT="field clazz" /> + diff --git a/core/src/main/resources/lib/form/password.jelly b/core/src/main/resources/lib/form/password.jelly index b9a9c2d232..09b8f5695d 100644 --- a/core/src/main/resources/lib/form/password.jelly +++ b/core/src/main/resources/lib/form/password.jelly @@ -59,4 +59,5 @@ THE SOFTWARE. value="${h.getPasswordValue(attrs.value ?: instance[attrs.field])}" type="password" ATTRIBUTES="${attrs}" EXCEPT="field clazz" /> + diff --git a/core/src/main/resources/lib/form/select.jelly b/core/src/main/resources/lib/form/select.jelly index 359d1c8e70..0180600b32 100644 --- a/core/src/main/resources/lib/form/select.jelly +++ b/core/src/main/resources/lib/form/select.jelly @@ -56,4 +56,5 @@ THE SOFTWARE. + -- GitLab