Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/iago1460/django-radio int…
Browse files Browse the repository at this point in the history
…o pep8
  • Loading branch information
stefan-walluhn committed Mar 7, 2016
2 parents 5baccd5 + 6d92bca commit 69e7586
Show file tree
Hide file tree
Showing 52 changed files with 1,273 additions and 1,444 deletions.
4 changes: 2 additions & 2 deletions fabfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from fabric.api import env, local, require


env.heroku_project_name = 'radioco'
env.python = 'python2.7'
env.heroku_config_path = 'radio/configs/heroku'
Expand All @@ -11,6 +10,7 @@ def quickstart():
local('python manage.py create_example_data')
local('python manage.py runserver')


def master():
env.branch = 'master'

Expand Down Expand Up @@ -47,4 +47,4 @@ def heroku_deploy():
# Deploy changes
local('git push heroku %(branch)s' % env)
# Install requirements and run migrations
local('heroku run "python %(heroku_config_path)s/manage.py migrate"' % env)
local('heroku run "python %(heroku_config_path)s/manage.py migrate"' % env)
7 changes: 4 additions & 3 deletions radio/apps/dashboard/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@


class ScheduleForm(forms.Form):

def __init__(self, queryset, *args, **kwargs):
super(ScheduleForm, self).__init__(*args, **kwargs)
self.fields['source'] = forms.ModelChoiceField(queryset=queryset, required=False, empty_label=_('Without reference'), label=_("source"))
self.fields['source'].widget.attrs.update({'class' : 'form-control'})
self.fields['source'] = forms.ModelChoiceField(
queryset=queryset, required=False, empty_label=_('Without reference'), label=_("source")
)
self.fields['source'].widget.attrs.update({'class': 'form-control'})
Loading

0 comments on commit 69e7586

Please sign in to comment.