mirror of
https://github.com/Hopiu/django-fobi.git
synced 2026-05-11 22:33:09 +00:00
prepare 0.9.11; fixes
This commit is contained in:
parent
af39b1ff50
commit
fb205dcd3f
4 changed files with 57 additions and 15 deletions
|
|
@ -15,6 +15,12 @@ are used for versioning (schema follows below):
|
|||
0.3.4 to 0.4).
|
||||
- All backwards incompatible changes are mentioned in this document.
|
||||
|
||||
0.9.11
|
||||
------
|
||||
2016-11-01
|
||||
|
||||
- Fixes.
|
||||
|
||||
0.9.10
|
||||
------
|
||||
2016-11-01
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -4,7 +4,7 @@ import sys
|
|||
from distutils.version import LooseVersion
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
version = '0.9.10'
|
||||
version = '0.9.11'
|
||||
|
||||
# ***************************************************************************
|
||||
# ************************** Django version *********************************
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
__title__ = 'django-fobi'
|
||||
__version__ = '0.9.10'
|
||||
__version__ = '0.9.11'
|
||||
__build__ = 0x00006c
|
||||
__author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
|
||||
__copyright__ = '2014-2016 Artur Barseghyan'
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ from django.utils.html import format_html
|
|||
from django.utils.safestring import mark_safe
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from nine import versions
|
||||
|
||||
from .helpers import flatatt_inverse_quotes
|
||||
|
||||
# Safe import of ``NumberInput``
|
||||
|
|
@ -106,17 +108,51 @@ class RichSelectInverseQuotes(RichSelect):
|
|||
|
||||
Uses inverse quotes.
|
||||
"""
|
||||
if versions.DJANGO_GTE_1_10:
|
||||
def render(self, name, value, attrs=None):
|
||||
if self.override_name is not None:
|
||||
name = self.override_name
|
||||
|
||||
def render(self, name, value, attrs=None):
|
||||
if value is None:
|
||||
value = ''
|
||||
final_attrs = self.build_attrs(attrs, name=name)
|
||||
output = [format_html(
|
||||
'<select{}>',
|
||||
flatatt_inverse_quotes(final_attrs)
|
||||
)]
|
||||
options = self.render_options([value])
|
||||
if options:
|
||||
output.append(options)
|
||||
output.append('</select>')
|
||||
return mark_safe('\n'.join(output))
|
||||
if value is None:
|
||||
value = ''
|
||||
final_attrs = self.build_attrs(attrs, name=name)
|
||||
output = [
|
||||
format_html('<select{}>', flatatt_inverse_quotes(final_attrs))
|
||||
]
|
||||
options = self.render_options([value])
|
||||
if options:
|
||||
output.append(options)
|
||||
output.append('</select>')
|
||||
rendered_select = mark_safe('\n'.join(output))
|
||||
|
||||
return mark_safe(
|
||||
'\n'.join([
|
||||
format_html(self.prepend_html),
|
||||
rendered_select,
|
||||
format_html(self.append_html)
|
||||
])
|
||||
)
|
||||
else:
|
||||
def render(self, name, value, attrs=None, choices=()):
|
||||
if self.override_name is not None:
|
||||
name = self.override_name
|
||||
|
||||
if value is None:
|
||||
value = ''
|
||||
final_attrs = self.build_attrs(attrs, name=name)
|
||||
output = [
|
||||
format_html('<select{}>', flatatt_inverse_quotes(final_attrs))
|
||||
]
|
||||
options = self.render_options(choices, [value])
|
||||
if options:
|
||||
output.append(options)
|
||||
output.append('</select>')
|
||||
rendered_select = mark_safe('\n'.join(output))
|
||||
|
||||
return mark_safe(
|
||||
'\n'.join([
|
||||
format_html(self.prepend_html),
|
||||
rendered_select,
|
||||
format_html(self.append_html)
|
||||
])
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue