diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-23 15:31:41 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-23 15:31:41 +0200 |
| commit | 4a6dfcb759cb6da970dac55a0b9a116114ce71e7 (patch) | |
| tree | 15bf03e46bba55e37b6e2ee8be19ff6992df8a62 | |
| parent | django 1.1 fix (diff) | |
| download | pyload-4a6dfcb759cb6da970dac55a0b9a116114ce71e7.tar.xz | |
fixes for django 1.1
| -rw-r--r-- | module/web/ServerThread.py | 2 | ||||
| -rw-r--r-- | module/web/pyload/templatetags/token.py | 8 | ||||
| -rw-r--r-- | module/web/syncdb_django11.py | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/module/web/ServerThread.py b/module/web/ServerThread.py index 40683004a..c07364243 100644 --- a/module/web/ServerThread.py +++ b/module/web/ServerThread.py @@ -43,7 +43,7 @@ class WebServer(threading.Thread): #print "### You have to add at least one User, to gain access to webinterface: python %s createsuperuser" % join(self.pycore.path, "module", "web", "manage.py") #print "### Dont forget to restart pyLoad if you are done." log.warning(_("Database for Webinterface does not exitst, it will not be available.")) - log.warning(_("Please run: python pyLoadCore -s")) + log.warning(_("Please run: python pyLoadCore.py -s")) log.warning(_("Go through the setup and create a database and add an user to gain access.")) return None diff --git a/module/web/pyload/templatetags/token.py b/module/web/pyload/templatetags/token.py index fc190db73..e6117b839 100644 --- a/module/web/pyload/templatetags/token.py +++ b/module/web/pyload/templatetags/token.py @@ -5,9 +5,13 @@ register = template.Library() if VERSION[:3] < (1,1,2): + class TokenNode(template.Node): + def render(self, content): + return "" + @register.tag() - def csrf_token(): + def csrf_token(parser, token): """ Return nothing, since csrf is deactivated in django 1.1 """ - return "" + return TokenNode() diff --git a/module/web/syncdb_django11.py b/module/web/syncdb_django11.py index 412454176..c579718e0 100644 --- a/module/web/syncdb_django11.py +++ b/module/web/syncdb_django11.py @@ -147,8 +147,8 @@ def handle_noargs(**options): transaction.commit_unless_managed() # Install the 'initial_data' fixture, using format discovery - from django.core.management import call_command - call_command('loaddata', 'initial_data', verbosity=verbosity) + #from django.core.management import call_command + #call_command('loaddata', 'initial_data', verbosity=verbosity) if __name__ == "__main__": handle_noargs()
\ No newline at end of file |