Skip to content

Commit

Permalink
Fix admin widgets rendering incorrectly (#1670)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafalp
rafalp authored Nov 20, 2023
1 parent cbcd64b commit 4240bd6
Show file tree
Hide file tree
Showing 6 changed files with 411 additions and 19 deletions.
4 changes: 2 additions & 2 deletions misago/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .plugins.pluginlist import load_plugin_list_if_exists


__version__ = "0.39.0"
__released__ = False
__version__ = "0.38.1"
__released__ = True
2 changes: 0 additions & 2 deletions misago/admin/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

from django.forms import (
CharField,
ClearableFileInput,
DateTimeField,
FileField,
RadioSelect,
TypedChoiceField,
ValidationError,
Expand Down
6 changes: 4 additions & 2 deletions misago/admin/templatetags/misago_admin_form.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ def is_select_field(field):
return isinstance(field.field.widget, forms.Select)


MULTIPLE_CHOICE_WIDGETS = (forms.CheckboxSelectMultiple, forms.SelectMultiple)


@register.filter
def is_multiple_choice_field(field):
multichoice_widgets = (forms.CheckboxSelectMultiple, forms.SelectMultiple)
return isinstance(field.field.widget, multichoice_widgets)
return isinstance(field.field.widget, MULTIPLE_CHOICE_WIDGETS)


@register.filter
Expand Down
349 changes: 349 additions & 0 deletions misago/admin/tests/__snapshots__/test_admin_form_templatetags.ambr
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,349 @@
# serializer version: 1
# name: test_image_row_with_value_renders_help_text
'''
<div class="form-group">
<label for="id_image_field" class="control-label">
Image!:
</label>
<div class="">
<div class="control-image-preview">
<img src="test-image.png" alt="" />

</div>


<input accept="image/*" class="form-control" id="id_image_field" name="image_field" type="file" value="test-image.png" required is_initial >



<small class="form-text text-muted">I am a help text.</small>

</div>
</div>
'''
# ---
# name: test_image_row_with_value_renders_image_preview
'''
<div class="form-group">
<label for="id_image_field" class="control-label">
Image!:
</label>
<div class="">
<div class="control-image-preview">
<img src="test-image.png" alt="" />

</div>


<input accept="image/*" class="form-control" id="id_image_field" name="image_field" type="file" value="test-image.png" required is_initial >



<small class="form-text text-muted">I am a help text.</small>

</div>
</div>
'''
# ---
# name: test_image_row_with_value_renders_input
'''
<div class="form-group">
<label for="id_image_field" class="control-label">
Image!:
</label>
<div class="">
<div class="control-image-preview">
<img src="test-image.png" alt="" />

</div>


<input accept="image/*" class="form-control" id="id_image_field" name="image_field" type="file" value="test-image.png" required is_initial >



<small class="form-text text-muted">I am a help text.</small>

</div>
</div>
'''
# ---
# name: test_image_row_with_value_renders_input_and_field_css_class
'''
<div class="form-group">
<label for="id_image_field" class="control-label">
Image!:
</label>
<div class="col-md-9">
<div class="control-image-preview">
<img src="test-image.png" alt="" />

</div>


<input accept="image/*" class="form-control" id="id_image_field" name="image_field" type="file" value="test-image.png" required is_initial >



<small class="form-text text-muted">I am a help text.</small>

</div>
</div>
'''
# ---
# name: test_image_row_with_value_renders_input_and_label_and_field_css_classes
'''
<div class="form-group">
<label for="id_image_field" class="control-label col-md-3">
Image!:
</label>
<div class="col-md-9">
<div class="control-image-preview">
<img src="test-image.png" alt="" />

</div>


<input accept="image/*" class="form-control" id="id_image_field" name="image_field" type="file" value="test-image.png" required is_initial >



<small class="form-text text-muted">I am a help text.</small>

</div>
</div>
'''
# ---
# name: test_image_row_with_value_renders_input_and_label_css_class
'''
<div class="form-group">
<label for="id_image_field" class="control-label col-md-3">
Image!:
</label>
<div class="">
<div class="control-image-preview">
<img src="test-image.png" alt="" />

</div>


<input accept="image/*" class="form-control" id="id_image_field" name="image_field" type="file" value="test-image.png" required is_initial >



<small class="form-text text-muted">I am a help text.</small>

</div>
</div>
'''
# ---
# name: test_image_row_with_value_renders_label
'''
<div class="form-group">
<label for="id_image_field" class="control-label">
Image!:
</label>
<div class="">
<div class="control-image-preview">
<img src="test-image.png" alt="" />

</div>


<input accept="image/*" class="form-control" id="id_image_field" name="image_field" type="file" value="test-image.png" required is_initial >



<small class="form-text text-muted">I am a help text.</small>

</div>
</div>
'''
# ---
# name: test_row_with_checkbox_select_field_is_rendered
'''
<div class="form-group">
<label for="" class="control-label">
Color:
</label>
<div class="controls control-radioselect controls control-checkboxselect ">




<div class="form-check">
<input class_name="form-check-input" id="id_checkbox_select_field_0" name="checkbox_select_field" type="checkbox" value="r">
<label class="form-check-label" for="id_checkbox_select_field_0">
Red
</label>
</div>

<div class="form-check">
<input class_name="form-check-input" id="id_checkbox_select_field_1" name="checkbox_select_field" type="checkbox" value="g">
<label class="form-check-label" for="id_checkbox_select_field_1">
Green
</label>
</div>

<div class="form-check">
<input class_name="form-check-input" id="id_checkbox_select_field_2" name="checkbox_select_field" type="checkbox" value="b">
<label class="form-check-label" for="id_checkbox_select_field_2">
Blue
</label>
</div>




</div>
</div>
'''
# ---
# name: test_row_with_radio_select_field_is_rendered
'''
<div class="form-group">
<label for="" class="control-label">
Choice:
</label>
<div class="controls control-radioselect ">





<div class="form-check">
<input class_name="form-check-input" id="id_ratio_select_field_0" name="ratio_select_field" type="radio" value="y">
<label class="form-check-label" for="id_ratio_select_field_0">
Yes
</label>
</div>

<div class="form-check">
<input class_name="form-check-input" id="id_ratio_select_field_1" name="ratio_select_field" type="radio" value="n">
<label class="form-check-label" for="id_ratio_select_field_1">
No
</label>
</div>





</div>
</div>
'''
# ---
# name: test_row_with_select_field_is_rendered
'''
<div class="form-group">
<label for="id_select_field" class="control-label">
Choice:
</label>
<div class="">



<select class="form-control" id="id_select_field" name="select_field" required>

<option value="y" >
Yes
</option>

<option value="n" >
No
</option>

</select>



</div>
</div>
'''
# ---
# name: test_row_with_select_multiple_field_is_rendered
'''
<div class="form-group">
<label for="id_multiple_select_field" class="control-label">
Rank:
</label>
<div class="controls control-checkboxselect ">




<div class="form-check">
<input class_name="form-check-input" id="" name="multiple_select_field" type="checkbox" value="r">
<label class="form-check-label" for="">
Red
</label>
</div>

<div class="form-check">
<input class_name="form-check-input" id="" name="multiple_select_field" type="checkbox" value="g">
<label class="form-check-label" for="">
Green
</label>
</div>

<div class="form-check">
<input class_name="form-check-input" id="" name="multiple_select_field" type="checkbox" value="b">
<label class="form-check-label" for="">
Blue
</label>
</div>




</div>
</div>
'''
# ---
# name: test_row_with_textarea_field_is_rendered
'''
<div class="form-group">
<label for="id_textarea_field" class="control-label">
Message:
</label>
<div class="">


<textarea cols="40" rows="10" maxlength="255" class="form-control" id="id_textarea_field" name="textarea_field" required ></textarea>



</div>
</div>
'''
# ---
# name: test_row_with_yes_no_field_is_rendered
'''
<div class="form-group">
<label for="" class="control-label">
Switch:
</label>
<div class="controls control-yesno-switch ">





<label class="radio">
<input class="yesno-switch" id="id_yesno_field_0" name="yesno_field" type="radio" value="1">
Yes
</label>

<label class="radio">
<input class="yesno-switch" id="id_yesno_field_1" name="yesno_field" type="radio" value="0" checked>
No
</label>





</div>
</div>
'''
# ---
Loading

0 comments on commit 4240bd6

Please sign in to comment.