diff --git a/devel/er.dia b/devel/er.dia index 245a692..b502492 100644 Binary files a/devel/er.dia and b/devel/er.dia differ diff --git a/k4ever/main/models.py b/k4ever/main/models.py index 47af53a..c15a09c 100644 --- a/k4ever/main/models.py +++ b/k4ever/main/models.py @@ -24,6 +24,6 @@ class PluginPermission(models.Model): authBlob = models.TextField() class Plugin(models.Model): - pluginUser = models.ForeignKey(User) - uniqueAuthblob = models.BooleanField() + user = models.ForeignKey(User) + uniqueAuthblob = models.BooleanField(default=False) diff --git a/k4ever/main/templates/main/navigation-login.html b/k4ever/main/templates/main/navigation-login.html index e64a6da..09dc2ad 100644 --- a/k4ever/main/templates/main/navigation-login.html +++ b/k4ever/main/templates/main/navigation-login.html @@ -3,6 +3,7 @@
  • Einkaufen
  • Konto
  • Frühere Einkäufe
  • +
  • Einstellungen
  • {% if user.is_staff %}
  • Administration
  • {% endif %} diff --git a/k4ever/main/templates/settings/settings.html b/k4ever/main/templates/settings/settings.html new file mode 100644 index 0000000..03842ff --- /dev/null +++ b/k4ever/main/templates/settings/settings.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% block "content" %} +

    Passwort

    +
    + <Change Password here> +
    +
    +
    +

    Plugin permissions

    +
    +{% endblock %} diff --git a/k4ever/main/urls.py b/k4ever/main/urls.py index f42a0f1..780a285 100644 --- a/k4ever/main/urls.py +++ b/k4ever/main/urls.py @@ -10,4 +10,5 @@ urlpatterns = patterns('', (r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'registration/logout.html', 'next_page': '/user/login/'}), + (r'^settings/$', 'main.views.settings'), ) diff --git a/k4ever/main/views.py b/k4ever/main/views.py index 8addc4d..4022526 100644 --- a/k4ever/main/views.py +++ b/k4ever/main/views.py @@ -17,3 +17,7 @@ def startpage(request): def register(request): return render_to_response("registration/register.html", RequestContext(request)) + +@login_required +def settings(request): + return render_to_response("settings/settings.html", RequestContext(request))