This commit is contained in:
Élie Bouttier 2014-08-30 17:47:19 -07:00
parent 0ecf6d3dc9
commit 92ea48f89d
12 changed files with 55 additions and 47 deletions

View file

@ -8,8 +8,8 @@ __all__ = [ 'UserForm', 'GroupForm', 'TeamForm' ]
UserForm = modelform_factory(User, UserForm = modelform_factory(User,
fields=['username', 'first_name', 'last_name', fields=['username', 'first_name',
'password', 'email', 'is_superuser'], 'last_name', 'password', 'email', 'is_superuser'],
widgets={'password': PasswordInput}) widgets={'password': PasswordInput})
GroupForm = modelform_factory(Group, GroupForm = modelform_factory(Group,
fields=['name']) fields=['name'])

View file

@ -151,7 +151,8 @@ def group_add_user(request, group):
else: else:
user.groups.add(group) user.groups.add(group)
user.save() user.save()
messages.success(request, 'User added to group successfully.') messages.success(request,
'User added to group successfully.')
else: else:
messages.error(request, 'User not found.') messages.error(request, 'User not found.')
return redirect('show-group', group.id) return redirect('show-group', group.id)
@ -249,7 +250,8 @@ def team_add_user(request, team):
else: else:
team.users.add(user) team.users.add(user)
team.save() team.save()
messages.success(request, 'User added to team successfully.') messages.success(request,
'User added to team successfully.')
else: else:
messages.error(request, 'User not found.') messages.error(request, 'User not found.')
request.session['team-tab'] = 'user' request.session['team-tab'] = 'user'
@ -299,7 +301,8 @@ def team_add_group(request, team):
else: else:
team.groups.add(group) team.groups.add(group)
team.save() team.save()
messages.success(request, 'Group added to team successfully.') messages.success(request,
'Group added to team successfully.')
else: else:
messages.error(request, 'Group not found.') messages.error(request, 'Group not found.')
request.session['team-tab'] = 'group' request.session['team-tab'] = 'group'

View file

@ -11,6 +11,7 @@ on the foreign object id, we can rely on database cascade deletion to delete
outaded permissions and we have to do it our-self. outaded permissions and we have to do it our-self.
""" """
@receiver(pre_delete, sender=User, dispatch_uid="clean_user_perms") @receiver(pre_delete, sender=User, dispatch_uid="clean_user_perms")
def clean_user_perms(sender, instance, **kwargs): def clean_user_perms(sender, instance, **kwargs):
# Clean global permissions # Clean global permissions

View file

@ -1,9 +1,9 @@
from ponytracker.settings import * from ponytracker.settings import *
### Uncomment to use celery worker # # Uncomment to use celery worker
### Don't forget to install a broker: # # Don't forget to install a broker:
### # http://docs.celeryproject.org/en/latest/getting-started/brokers/index.html#broker-overview # # http://docs.celeryproject.org/en/latest/getting-started/brokers/index.html#broker-overview
# INSTALLED_APPS += ('djcelery',) # INSTALLED_APPS += ('djcelery',)
# import djcelery # import djcelery
# djcelery.setup_loader() # djcelery.setup_loader()

View file

@ -143,13 +143,16 @@ BOOTSTRAP3 = {
#'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.2.0/', #'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.2.0/',
'base_url': STATIC_URL, 'base_url': STATIC_URL,
# The complete URL to the Bootstrap CSS file (None means derive it from base_url) # The complete URL to the Bootstrap CSS file
# (None means derive it from base_url)
'css_url': None, 'css_url': None,
# The complete URL to the Bootstrap CSS file (None means no theme) # The complete URL to the Bootstrap CSS file
# (None means no theme)
'theme_url': None, 'theme_url': None,
# The complete URL to the Bootstrap JavaScript file (None means derive it from base_url) # The complete URL to the Bootstrap JavaScript file
# (None means derive it from base_url)
'javascript_url': None, 'javascript_url': None,
} }

View file

@ -1,3 +1,3 @@
[pep8] [pep8]
exclude=env,issue/migrations,issue/urls.py exclude=env,*/migrations,*/urls.py,doc
ignore=E128 ignore=E128,E265

View file

@ -16,7 +16,8 @@ class ProjectForm(forms.ModelForm):
model = Project model = Project
fields = ['display_name', 'name', 'description', 'access'] fields = ['display_name', 'name', 'description', 'access']
help_texts = { help_texts = {
'name': 'Warning: if you change this value, this will break existing URLs.' 'name': 'Warning: if you change this value, '
'this will break existing URLs.'
} }