Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tox fixes #136

Merged
merged 2 commits into from
Nov 2, 2014
Merged

Tox fixes #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a6c52a
Retain empty docs/_static folder
jwhitlock Nov 2, 2014
fbe3544
PEP8 fixes and ignores
jwhitlock Nov 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added docs/_static/.keep
View file
Open in desktop
Empty file.
3 changes: 2 additions & 1 deletion simple_history/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ def history_form_view(self, request, object_id, version_id):
'has_absolute_url': False,
'form_url': '',
'opts': model._meta,
'content_type_id': ContentType.objects.get_for_model(self.model).id,
'content_type_id': ContentType.objects.get_for_model(
self.model).id,
'save_as': self.save_as,
'save_on_top': self.save_on_top,
'root_path': getattr(self.admin_site, 'root_path', None),
Expand Down
3 changes: 2 additions & 1 deletion simple_history/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
except ImportError:
pass
else:
add_introspection_rules([], ["^simple_history.models.CustomForeignKeyField"])
add_introspection_rules(
[], ["^simple_history.models.CustomForeignKeyField"])
from .manager import HistoryDescriptor

registered_models = {}
Expand Down
1 change: 1 addition & 0 deletions simple_history/tests/migration_test_app/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
# flake8: noqa
from __future__ import unicode_literals

from django.db import models, migrations
Expand Down