Changeset 1445

Timestamp:

02/25/08 16:39:19 (9 months ago)

Author:

JensDiemer

Message:

-insert update v0.8.0 to v0.8.1
-update TinyMCE using, see: http://pylucid.org/phpBB2/viewtopic.php?t=195

Location:

trunk/pylucid/PyLucid

Files:

• install/update.py (modified) (4 diffs)
• plugins_internal/page_admin/page_admin.py (modified) (1 diff)

trunk/pylucid/PyLucid/install/update.py

@@ -11 +11 @@
 from django.db import connection
 
+from PyLucid.install.install import Sync_DB
 from PyLucid.install.BaseInstall import BaseInstall
 from PyLucid.settings import OLD_TABLE_PREFIX
@@ -18 +19 @@
 
 #______________________________________________________________________________
-
-from PyLucid.install.install import Sync_DB
+class Update2(BaseInstall):
+    def view(self):
+        self._redirect_execute(self._update)
+
+        return self._simple_render(
+            headline="Update PyLucid from v0.8.0 to v0.8.1"
+        )
+
+    def _update(self):
+        print "update markup...",
+        # insert a new markup for html without TinyMCE
+        m = Markup(id=0, name="html")
+        m.save()
+
+        # rename the old "html"
+        m = Markup.objects.get(id=1)
+        m.name = "html + TinyMCE"
+        m.save()
+        print "done."
+
+        print "existing Markups:"
+        for m in Markup.objects.all():
+            print "%5s - %s" % (m.id, m)
+
+
+def update2(request):
+    """
+    1. update from v0.8.0 to v0.8.1
+    """
+    return Update2(request).start_view()
+
+#______________________________________________________________________________
+
+
 class Update(Sync_DB):
     """
@@ -400 +433 @@
 
 
-
 def update(request):
     """
-    1. update DB tables from v0.7.2 to django PyLucid v0.8
+    2. update DB tables from v0.7.2 to django PyLucid v0.8
     """
     return Update(request).start_view()
@@ -575 +607 @@
                 print "\t - WARNING: unsupportet tag '%s' in Template!" % tag
 
-    #___________________________________________________________________________
-
-
-
-#    def update_internalpage(self):
-#        from PyLucid.tools.Diff import display_plaintext_diff
-#        from PyLucid.models import PagesInternal
-#
-#        for internal_page in PagesInternal.objects.all():
-#            name = internal_page.name
-#            old_content = internal_page.content_html
-#
-#            print "\n==================[ %s ]==================\n" % name
-#            _display_warnings(old_content)
-#            content = _convert_internalpage(old_content)
-#            if not content:
-#                print "\t - Nothing to change."
-#                continue
-#
-#            print "\t - changed!\n\nthe diff:"
-#            display_plaintext_diff(old_content, content)
-#
-#            internal_page.content_html = content
-#            internal_page.save()
-#            print "\t - updated and saved."
-#            print
-#            print
-
 
 def update_templates(request):
     """
-    2. update to the new django template engine
+    3. update to the new django template engine
     """
     return UpdateTemplates(request).start_view()

trunk/pylucid/PyLucid/plugins_internal/page_admin/page_admin.py

@@ -269 +269 @@
 
 
-        if page_instance.markup.name == "None":
-            # If there is no markup engine used -> insert TinyMCE JS Editor
+        if page_instance.markup.id == 1:
+            # markup with id=1 is html + TinyMCE JS Editor
             js_data = (
                 '<script language="javascript" type="text/javascript"'