Changeset 1551 for trunk/pylucid/PyLucid/system/detect_page.py

Timestamp:

05/02/08 16:47:16 (23 months ago)

Author:

JensDiemer

Message:

update preferences:

• move the preferences form from the plugin module into the plugin config modul
• a plugin must not use try...except to get the preferences
• update all modules around the plugin install/deinstall etc.
• detect_page used the system_settings "index_page" value (setup a other default index page works!)

Files:

• trunk/pylucid/PyLucid/system/detect_page.py (modified) (4 diffs)

trunk/pylucid/PyLucid/system/detect_page.py

@@ -17 +17 @@
 """
 
-from PyLucid.models import Page
-from PyLucid.system.exceptions import AccessDenied, LowLevelError
-
 from django.utils.translation import ugettext as _
 from django.http import Http404, HttpResponseRedirect
+
+from PyLucid.system.exceptions import AccessDenied, LowLevelError
+from PyLucid.models import Page, Plugin
+
 
 def get_a_page():
     """
     Try to get and return a existing page.
-    Create a first page, if no page exists.
     """
     try:
@@ -37 +37 @@
 
 
-def get_default_page_id():
+def get_default_page_id(request):
     """
     returns the default page id
     """
     try:
-        default_page = Preference.objects.get(name__exact="index page")
-#        default_page = "raise!"
-        return int(default_page.value)
+        preferences = Plugin.objects.get_preferences("system_settings")
+        default_page_id = preferences["index_page"]
+        return default_page_id
     except Exception, e:
         # TODO: make a page message for the admin
@@ -53 +53 @@
 
 
-def get_default_page():
-    page_id = get_default_page_id()
+def get_default_page(request):
+    page_id = get_default_page_id(request)
     try:
 #        page_id = "wrong test"
@@ -76 +76 @@
     if page_name == "":
         # Index Seite wurde aufgerufen. Zumindest bei poor-modrewrite
-        return get_default_page()
+        return get_default_page(request)
 
     # bsp/und%2Foder -> ['bsp', 'und%2Foder']