Hopiu/django-fobi
1
0
Fork 0
mirror of https://github.com/Hopiu/django-fobi.git synced 2026-05-25 12:43:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

prepare 0.10.6

Browse source
This commit is contained in:
Artur Barseghyan 2017-02-14 20:50:05 +01:00
parent 248f0c67db
commit 82e04d8e14
15 changed files with 120 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.rst
View file

@ -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.10.6
------
2017-02-14
- Minor Python 3 fixes for integer, float and decimal fields.
0.10.5
------
2017-02-13

12
examples/requirements/django_1_11.txt
View file

@ -2,12 +2,12 @@
Django==1.11a1
django-admin-tools>=0.8.0
#django-autoslug==1.9.3
django-debug-toolbar==1.5
#django-formtools==1.0
#django-nine>=0.1.10
#django-nonefield==0.1
django-registration-redux>=1.4
#easy-thumbnails==2.3
#vishap>=0.1.5
sqlparse==0.2.2
# easy-thumbnails, compatible with Django 1.11
https://github.com/django/django-formtools/archive/master.tar.gz
# django-formtools, compatible with Django 1.11
https://github.com/SmileyChris/easy-thumbnails/archive/master.tar.gz

6
examples/simple/bar/forms.py Normal file
View file

@ -0,0 +1,6 @@
from django import forms
class MyForm(forms.Form):
"""Test form."""
number = forms.IntegerField(max_value=200)

17
examples/simple/bar/templates/bar/form.html Normal file
View file

@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
<form action="{{ request.path }}" method="post">
{% csrf_token %}
{{ form.non_field_errors }}
{{ form }}
<input type="submit" value="Submit" />
</form>
</body>
</html>

8
examples/simple/bar/urls.py Normal file
View file

@ -0,0 +1,8 @@
from django.conf.urls import include, url
from django.utils.translation import ugettext_lazy as _
from .views import my_view
urlpatterns = [
url(_(r'^$'), my_view, name='bar.my_view'),
]

13
examples/simple/bar/views.py Normal file
View file

@ -0,0 +1,13 @@
from django.shortcuts import render
from .forms import MyForm
def my_view(request):
if request.method == 'POST':
form = MyForm(data=request.POST)
else:
form = MyForm()
context = {'form': form}
return render(request, 'bar/form.html', context)

1
examples/simple/runserver/bootstrap3-theme-django-1-11.sh Executable file
View file

@ -0,0 +1 @@
./manage.py runserver 0.0.0.0:8000 --traceback -v 3 --settings=settings.bootstrap3_theme_django_1_11 --traceback -v 3

19
examples/simple/settings/bootstrap3_theme_django_1_11.py Normal file
View file

@ -0,0 +1,19 @@
from .base import *
INSTALLED_APPS = list(INSTALLED_APPS)
try:
INSTALLED_APPS.remove('south') if 'south' in INSTALLED_APPS else None
INSTALLED_APPS.remove('tinymce') if 'tinymce' in INSTALLED_APPS else None
except Exception as err:
pass
try:
INSTALLED_APPS.remove('admin_tools') \
if 'admin_tools' in INSTALLED_APPS else None
INSTALLED_APPS.remove('admin_tools.menu') \
if 'admin_tools.menu' in INSTALLED_APPS else None
INSTALLED_APPS.remove('admin_tools.dashboard') \
if 'admin_tools.dashboard' in INSTALLED_APPS else None
except Exception as err:
pass

3
examples/simple/urls.py
View file

@ -57,6 +57,9 @@ url_patterns_args = [
# foo URLs:
url(r'^foo/', include('foo.urls')),
# bar URLs:
# url(r'^bar/', include('bar.urls')),
url(r'^$', TemplateView.as_view(template_name=fobi_home_template)),
# django-fobi public forms contrib app:

8
scripts/install_django_1_11.sh Executable file
View file

@ -0,0 +1,8 @@
pip uninstall south -y
pip install -r examples/requirements/django_1_11.txt
python setup.py install
mkdir -p examples/logs examples/db examples/media examples/media/static examples/media/fobi_plugins/content_image
mkdir -p examples/media/fobi_plugins/file
python examples/simple/manage.py collectstatic --noinput --settings=settings.bootstrap3_theme_django_1_11 --traceback -v 3
python examples/simple/manage.py migrate --noinput --settings=settings.bootstrap3_theme_django_1_11 --traceback -v 3
python examples/simple/manage.py fobi_create_test_data --settings=settings.bootstrap3_theme_django_1_11 --traceback -v 3

2
setup.py
View file

@ -4,7 +4,7 @@ import sys
from distutils.version import LooseVersion
from setuptools import setup, find_packages
version = '0.10.5'
version = '0.10.6'
# ***************************************************************************
# ************************** Python version *********************************

4
src/fobi/__init__.py
View file

@ -1,6 +1,6 @@
__title__ = 'django-fobi'
__version__ = '0.10.5'
__build__ = 0x000078
__version__ = '0.10.6'
__build__ = 0x000079
__author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
__copyright__ = '2014-2017 Artur Barseghyan'
__license__ = 'GPL 2.0/LGPL 2.1'

23
src/fobi/contrib/plugins/form_elements/fields/decimal/base.py
View file

@ -1,5 +1,7 @@
from __future__ import absolute_import
import decimal
from django.forms.fields import DecimalField
from django.utils.translation import ugettext_lazy as _
@ -41,19 +43,24 @@ class DecimalInputPlugin(FormFieldPlugin):
'initial': self.data.initial,
'required': self.data.required,
}
if self.data.max_value:
field_kwargs['max_value'] = self.data.max_value
widget_attrs['max'] = self.data.max_value
data_max_value = decimal.Decimal(self.data.max_value)
field_kwargs['max_value'] = data_max_value
widget_attrs['max'] = data_max_value
if self.data.min_value:
field_kwargs['min_value'] = self.data.min_value
widget_attrs['min'] = self.data.min_value
data_min_value = decimal.Decimal(self.data.min_value)
field_kwargs['min_value'] = data_min_value
widget_attrs['min'] = data_min_value
if self.data.max_digits:
field_kwargs['max_digits'] = self.data.max_digits
widget_attrs['max'] = self.data.max_value
data_max_digits = int(self.data.max_digits)
field_kwargs['max_digits'] = data_max_digits
if self.data.decimal_places:
field_kwargs['decimal_places'] = self.data.decimal_places
widget_attrs['min'] = self.data.min_value
data_decimal_places = int(self.data.decimal_places)
field_kwargs['decimal_places'] = data_decimal_places
field_kwargs['widget'] = NumberInput(attrs=widget_attrs)

13
src/fobi/contrib/plugins/form_elements/fields/float/base.py
View file

@ -34,18 +34,23 @@ class FloatInputPlugin(FormFieldPlugin):
'type': 'number',
'placeholder': self.data.placeholder,
}
field_kwargs = {
'label': self.data.label,
'help_text': self.data.help_text,
'initial': self.data.initial,
'required': self.data.required,
}
if self.data.max_value:
field_kwargs['max_value'] = self.data.max_value
widget_attrs['max'] = self.data.max_value
data_max_value = float(data.max_value)
field_kwargs['max_value'] = data_max_value
widget_attrs['max'] = data_max_value
if self.data.min_value:
field_kwargs['min_value'] = self.data.min_value
widget_attrs['min'] = self.data.min_value
data_min_value = float(self.data.min_value)
field_kwargs['min_value'] = data_min_value
widget_attrs['min'] = data_min_value
field_kwargs['widget'] = NumberInput(attrs=widget_attrs)

10
src/fobi/contrib/plugins/form_elements/fields/integer/base.py
View file

@ -41,11 +41,13 @@ class IntegerInputPlugin(FormFieldPlugin):
'required': self.data.required,
}
if self.data.max_value:
field_kwargs['max_value'] = self.data.max_value
widget_attrs['max'] = self.data.max_value
data_max_value = int(self.data.max_value)
field_kwargs['max_value'] = data_max_value
widget_attrs['max'] = data_max_value
if self.data.min_value:
field_kwargs['min_value'] = self.data.min_value
widget_attrs['min'] = self.data.min_value
data_min_value = int(self.data.min_value)
field_kwargs['min_value'] = data_min_value
widget_attrs['min'] = data_min_value
field_kwargs['widget'] = NumberInput(attrs=widget_attrs)