Commit cbb47f1

committed

Fix template select being editable when not in edit mode. Fix select rendering

1 parent 2d41af1 commit cbb47f1Copy full SHA for cbb47f1

File tree

+26

-24

lines changed

+26

-24

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -217,12 +217,7 @@ pre code .line::before {`
`217`	`217`	`/** select2 rendering fixes */`
`218`	`218`	`.select2-container--bootstrap-5 .select2-selection {`
`219`	`219`	`border: var(--bs-gray-500) 1px solid;`
`220`		`-}`
`221`		`-`
`222`		`-/* Selection rendered size */`
`223`		`-.select2-container .select2-selection--single .select2-selection__rendered {`
`224`		`- font-size: 85%;`
`225`		`- padding: 2px;`
	`220`	`+ font-size: inherit;`
`226`	`221`	`}`
`227`	`222`
`228`	`223`	`/* The opened input box */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`:value="$value ?: $template->attributeValue($o->name_lc)"`
`12`	`12`	`:options="$template->attributeOptions($o->name_lc)"`
`13`	`13`	`allowclear="true"`
`14`		`- :disabled="! $edit"/>`
	`14`	`+ :edit="$edit"/>`
`15`	`15`
`16`	`16`	`<x-form.invalid-feedback :errors="$e"/>`
`17`	`17`	`@endforeach`

Lines changed: 21 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,26 @@`
`7`	`7`	`@endisset`
`8`	`8`
`9`	`9`	`<div class="input-group">`
`10`		`- <x-select :id="$id ?? NULL" :name="$name ?? NULL" :old="$old ?? NULL" :options="$options ?? []" :value="$value ?? NULL" :class="$class ?? NULL"/>`
	`10`	`+ <x-select`
	`11`	`+ :id="$id ?? NULL"`
	`12`	`+ :name="$name ?? NULL"`
	`13`	`+ :old="$old ?? NULL"`
	`14`	`+ :options="$options ?? []"`
	`15`	`+ :value="$value ?? NULL"`
	`16`	`+ :class="$class ?? NULL"`
	`17`	`+ :disabled="! ($edit ?? FALSE)"/>`
	`18`	`+</div>`
`11`	`19`
`12`		`-@isset($name)`
`13`		`- <span class="invalid-feedback">`
`14`		`- @error((! empty($old)) ? $old : ($id ?? $name))`
`15`		`- {{ $message }}`
`16`		`- @elseif(isset($feedback))`
`17`		`- {{ $feedback }}`
`18`		`- @enderror`
`19`		`- </span>`
`20`		`-@endisset`
	`20`	`+@isset($name)`
	`21`	`+ <span class="invalid-feedback">`
	`22`	`+ @error((! empty($old)) ? $old : ($id ?? $name))`
	`23`	`+ {{ $message }}`
	`24`	`+ @elseif(isset($feedback))`
	`25`	`+ {{ $feedback }}`
	`26`	`+ @enderror`
	`27`	`+ </span>`
	`28`	`+@endisset`
`21`	`29`
`22`		`- @isset($helper)`
`23`		`- <span class="input-helper">{!! html_entity_decode($helper) !!}</span>`
`24`		`- @endif`
`25`		`-</div>`
	`30`	`+@isset($helper)`
	`31`	`+ <span class="input-helper">{!! html_entity_decode($helper) !!}</span>`
	`32`	`+@endif`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,10 +171,10 @@ function editmode() {`
`171`	`171`	`$(this).attr('readonly',false);`
`172`	`172`	`});`
`173`	`173`
`174`		`- // Our password type`
`175`		`- $('attribute#userpassword .form-select').each(function() {`
	`174`	`+ // Any select areas that are disabled`
	`175`	`+ $('attribute .form-select').each(function() {`
`176`	`176`	`$(this).prop('disabled',false);`
`177`		`- })`
	`177`	`+ });`
`178`	`178`
`179`	`179`	`// Objectclasses that can be removed`
`180`	`180`	`$('.input-group-end i.d-none').removeClass('d-none');`

Comments

(0)