shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 06:51:10 +03:00
Code Releases Activity

Merge pull request #7553 from jakemcdermott/fix-7530

Browse Source 
Fix self-closing tags for jquery 3.5 compat

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-07-06 17:01:46 +00:00 committed by GitHub
commit dbfb1780f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/features/credentials/add-edit-credentials.view.html
View File

@ -56,11 +56,11 @@
on-item-select="vm.onInputSourceItemSelect" on-item-select="vm.onInputSourceItemSelect"
on-test="vm.onInputSourceTest" on-test="vm.onInputSourceTest"
results-filter="vm.filterInputSourceCredentialResults" results-filter="vm.filterInputSourceCredentialResults"
/> ></at-input-source-lookup>
<at-external-credential-test <at-external-credential-test
ng-if="vm.externalTest.metadataInputs" ng-if="vm.externalTest.metadataInputs"
on-close="vm.onExternalTestClose" on-close="vm.onExternalTestClose"
on-submit="vm.onExternalTest" on-submit="vm.onExternalTest"
form="vm.externalTest.form" form="vm.externalTest.form"
/> ></at-external-credential-test>
<div ng-if="$state.current.name.includes('permissions.add')" ui-view="modal"></div> <div ng-if="$state.current.name.includes('permissions.add')" ui-view="modal"></div>

5
awx/ui/client/features/credentials/input-source-lookup.partial.html
View File

@ -23,7 +23,7 @@
ng-show="vm.selectedName" ng-show="vm.selectedName"
tag="vm.selectedName" tag="vm.selectedName"
icon="external" icon="external"
/> ></at-tag>
</div> </div>
<div <div
class="InputSourceLookup-selectedItemText" class="InputSourceLookup-selectedItemText"
@ -45,7 +45,8 @@
selected-id="vm.selectedId" selected-id="vm.selectedId"
on-ready="vm.onReady" on-ready="vm.onReady"
on-item-select="vm.onItemSelect" on-item-select="vm.onItemSelect"
/> >
</at-lookup-list>
<at-form state="vm.form" autocomplete="off" id="input_source_form"> <at-form state="vm.form" autocomplete="off" id="input_source_form">
<at-input-group <at-input-group
ng-if="vm.tabs.metadata._active" ng-if="vm.tabs.metadata._active"

5
awx/ui/client/lib/components/input/text.partial.html
View File

@ -22,12 +22,13 @@
icon="external" icon="external"
tag="state._tagValue" tag="state._tagValue"
remove-tag="state._onRemoveTag(state)" remove-tag="state._onRemoveTag(state)"
/> >
</at-tag>
<at-tag <at-tag
ng-show="state._disabled && state._tagValue" ng-show="state._disabled && state._tagValue"
icon="external" icon="external"
tag="state._tagValue" tag="state._tagValue"
/> ></at-tag>
</div> </div>
</span> </span>
<input ng-if="!state.asTag" type="text" class="form-control at-Input" <input ng-if="!state.asTag" type="text" class="form-control at-Input"

8
awx/ui/client/lib/components/input/textarea-secret.partial.html
View File

@ -19,7 +19,7 @@
ng-class="{'at-InputFile--drag': drag }" ng-class="{'at-InputFile--drag': drag }"
type="file" type="file"
name="files" name="files"
/> ></input>
<div <div
ng-if="state.asTag" ng-if="state.asTag"
ng-disabled="state._disabled || form.disabled" ng-disabled="state._disabled || form.disabled"
@ -31,12 +31,12 @@
icon="external" icon="external"
tag="state._tagValue" tag="state._tagValue"
remove-tag="state._onRemoveTag(state)" remove-tag="state._onRemoveTag(state)"
/> ></at-tag>
<at-tag <at-tag
ng-show="state._disabled && state._tagValue" ng-show="state._disabled && state._tagValue"
icon="external" icon="external"
tag="state._tagValue" tag="state._tagValue"
/> ></at-tag>
</div> </div>
</div> </div>
<textarea <textarea
@ -49,7 +49,7 @@
ng-attr-tabindex="{{ tab || undefined }}" ng-attr-tabindex="{{ tab || undefined }}"
ng-attr-placeholder="{{state._placeholder || undefined }}" ng-attr-placeholder="{{state._placeholder || undefined }}"
ng-disabled="state._disabled || form.disabled" ng-disabled="state._disabled || form.disabled"
/> ></textarea>
<div ng-if="state._edit" class="input-group-btn at-InputGroup-button input-group-append"> <div ng-if="state._edit" class="input-group-btn at-InputGroup-button input-group-append">
<button <button
aria-label="{{:: vm.strings.get('secret.REPLACE')}}" aria-label="{{:: vm.strings.get('secret.REPLACE')}}"

2
awx/ui/client/src/scheduler/schedulerDatePicker.partial.html
View File

@ -6,5 +6,5 @@
type="text" type="text"
readonly readonly
ng-model="dateValue" ng-model="dateValue"
ng-class="inputClass()"> ng-class="inputClass()"/>
</div> </div>

32
awx/ui/client/src/scheduler/schedulerForm.partial.html
View File

@ -29,7 +29,7 @@
id="schedulerName" id="schedulerName"
ng-model="schedulerName" required ng-model="schedulerName" required
ng-disabled="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd) || credentialRequiresPassword" ng-disabled="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd) || credentialRequiresPassword"
placeholder="{{strings.get('form.SCHEDULE_NAME')}}"> placeholder="{{strings.get('form.SCHEDULE_NAME')}}" />
<div class="error" <div class="error"
ng-show="scheduler_form.$dirty && scheduler_form.schedulerName.$error.required"> ng-show="scheduler_form.$dirty && scheduler_form.schedulerName.$error.required">
{{ strings.get('form.NAME_REQUIRED_MESSAGE') }} {{ strings.get('form.NAME_REQUIRED_MESSAGE') }}
@ -74,7 +74,7 @@
placeholder="{{strings.get('form.HH24')}}" placeholder="{{strings.get('form.HH24')}}"
aw-min="0" min="0" aw-max="23" aw-min="0" min="0" aw-max="23"
max="23" data-zero-pad="2" required max="23" data-zero-pad="2" required
ng-change="timeChange()" > ng-change="timeChange()" />
<span <span
class="SchedulerTime-separator"> class="SchedulerTime-separator">
: :
@ -90,7 +90,7 @@
placeholder="{{strings.get('form.MM')}}" placeholder="{{strings.get('form.MM')}}"
min="0" max="59" data-zero-pad="2" min="0" max="59" data-zero-pad="2"
required required
ng-change="timeChange()" > ng-change="timeChange()" />
<span <span
class="SchedulerTime-separator"> class="SchedulerTime-separator">
: :
@ -106,7 +106,7 @@
placeholder="{{strings.get('form.SS')}}" placeholder="{{strings.get('form.SS')}}"
min="0" max="59" data-zero-pad="2" min="0" max="59" data-zero-pad="2"
required required
ng-change="timeChange()" > ng-change="timeChange()" />
</div> </div>
<div class="error" <div class="error"
ng-show="scheduler_startTime_error"> ng-show="scheduler_startTime_error">
@ -173,7 +173,7 @@
min="1" min="1"
max="999" max="999"
ng-change="resetError('scheduler_interval_error')" ng-change="resetError('scheduler_interval_error')"
> />
<label class="inline-label <label class="inline-label
RepeatFrequencyOptions-inlineLabel" RepeatFrequencyOptions-inlineLabel"
ng-bind="schedulerIntervalLabel"> ng-bind="schedulerIntervalLabel">
@ -196,7 +196,7 @@
ng-model="$parent.monthlyRepeatOption" ng-model="$parent.monthlyRepeatOption"
ng-change="monthlyRepeatChange()" ng-change="monthlyRepeatChange()"
name="monthlyRepeatOption" name="monthlyRepeatOption"
id="monthlyRepeatOption"> id="monthlyRepeatOption" />
{{ strings.get('form.ON_DAY') }} {{ strings.get('form.ON_DAY') }}
</label> </label>
</div> </div>
@ -209,7 +209,7 @@
aw-spinner="$parent.monthDay" aw-spinner="$parent.monthDay"
ng-model="$parent.monthDay" ng-model="$parent.monthDay"
min="1" max="31" min="1" max="31"
ng-change="resetError('scheduler_monthDay_error')" > ng-change="resetError('scheduler_monthDay_error')" />
<div class="error" <div class="error"
ng-show="$parent.scheduler_monthDay_error"> ng-show="$parent.scheduler_monthDay_error">
{{ strings.get('form.MONTH_DAY_ERROR_MESSAGE') }} {{ strings.get('form.MONTH_DAY_ERROR_MESSAGE') }}
@ -228,7 +228,7 @@
ng-model="$parent.monthlyRepeatOption" ng-model="$parent.monthlyRepeatOption"
ng-change="monthlyRepeatChange()" ng-change="monthlyRepeatChange()"
name="monthlyRepeatOption" name="monthlyRepeatOption"
id="monthlyRepeatOption"> id="monthlyRepeatOption" />
{{ strings.get('form.ON_THE') }} {{ strings.get('form.ON_THE') }}
</label> </label>
</div> </div>
@ -267,7 +267,7 @@
ng-model="$parent.yearlyRepeatOption" ng-model="$parent.yearlyRepeatOption"
ng-change="yearlyRepeatChange()" ng-change="yearlyRepeatChange()"
name="yearlyRepeatOption" name="yearlyRepeatOption"
id="yearlyRepeatOption"> id="yearlyRepeatOption" />
{{ strings.get('form.ON') }} {{ strings.get('form.ON') }}
</label> </label>
</div> </div>
@ -292,7 +292,7 @@
ng-model="$parent.yearlyMonthDay" ng-model="$parent.yearlyMonthDay"
min="1" max="31" min="1" max="31"
ng-change="resetError('scheduler_yearlyMonthDay_error')" ng-change="resetError('scheduler_yearlyMonthDay_error')"
> />
</div> </div>
<div class="error" <div class="error"
ng-show="$parent.scheduler_yearlyMonthDay_error"> ng-show="$parent.scheduler_yearlyMonthDay_error">
@ -312,7 +312,7 @@
ng-model="$parent.yearlyRepeatOption" ng-model="$parent.yearlyRepeatOption"
ng-change="yearlyRepeatChange()" ng-change="yearlyRepeatChange()"
name="yearlyRepeatOption" name="yearlyRepeatOption"
id="yearlyRepeatOption"> id="yearlyRepeatOption" />
{{ strings.get('form.ON_THE') }} {{ strings.get('form.ON_THE') }}
</label> </label>
</div> </div>
@ -524,7 +524,7 @@
placeholder="{{strings.get('form.HH24')}}" placeholder="{{strings.get('form.HH24')}}"
aw-min="0" min="0" aw-max="23" aw-min="0" min="0" aw-max="23"
max="23" data-zero-pad="2" required max="23" data-zero-pad="2" required
ng-change="schedulerEndChange('schedulerEndHour', $parent.schedulerEndHour)" > ng-change="schedulerEndChange('schedulerEndHour', $parent.schedulerEndHour)" />
<span <span
class="SchedulerTime-separator"> class="SchedulerTime-separator">
: :
@ -540,7 +540,7 @@
placeholder="{{strings.get('form.MM')}}" placeholder="{{strings.get('form.MM')}}"
min="0" max="59" data-zero-pad="2" min="0" max="59" data-zero-pad="2"
required required
ng-change="schedulerEndChange('schedulerEndMinute', $parent.schedulerEndMinute)" > ng-change="schedulerEndChange('schedulerEndMinute', $parent.schedulerEndMinute)" />
<span <span
class="SchedulerTime-separator"> class="SchedulerTime-separator">
: :
@ -556,7 +556,7 @@
placeholder="{{strings.get('form.SS')}}" placeholder="{{strings.get('form.SS')}}"
min="0" max="59" data-zero-pad="2" min="0" max="59" data-zero-pad="2"
required required
ng-change="schedulerEndChange('schedulerEndSecond', $parent.schedulerEndSecond)" > ng-change="schedulerEndChange('schedulerEndSecond', $parent.schedulerEndSecond)" />
</div> </div>
<div class="error" <div class="error"
ng-show="scheduler_startTime_error"> ng-show="scheduler_startTime_error">
@ -604,7 +604,7 @@
class="SchedulerFormDetail-radioButton" class="SchedulerFormDetail-radioButton"
ng-model="dateChoice" ng-model="dateChoice"
id="date-choice-local" id="date-choice-local"
value="local" > value="local" />
{{ strings.get('form.LOCAL_TIME_ZONE') }} {{ strings.get('form.LOCAL_TIME_ZONE') }}
</label> </label>
<label class="radio-inline <label class="radio-inline
@ -613,7 +613,7 @@
class="SchedulerFormDetail-radioButton" class="SchedulerFormDetail-radioButton"
ng-model="dateChoice" ng-model="dateChoice"
id="date-choice-utc" id="date-choice-utc"
value="utc" > value="utc" />
UTC UTC
</label> </label>
</div> </div>