Changeset 1336:f7557bef0b09

Timestamp:

01/10/10 20:09:58 (2 years ago)

Author:

Georg Brandl <georg@…>

Branch:

default

Message:

Add repo ids of out-of-date components to upgrade info page.

Location:

zine

Files:

• _core.py (modified) (2 diffs)
• application.py (modified) (2 diffs)
• templates/admin/perform_upgrade.html (modified) (1 diff)
• upgrades/webapp.py (modified) (2 diffs)

zine/_core.py

@@ -30 +30 @@
 class InstanceUpgradeRequired(RuntimeError):
     """Zine requires a database upgrade"""
+    def __init__(self, repo_ids=None):
+        self.repo_ids = repo_ids
 
 class MissingDependency(RuntimeError):
@@ -67 +69 @@
             app.__init__(instance_folder)
             app.check_if_upgrade_required()
-        except InstanceUpgradeRequired:
+        except InstanceUpgradeRequired, inst:
             from zine.upgrades.webapp import WebUpgrades
-            _application = app = WebUpgrades(app)
+            _application = app = WebUpgrades(app, inst.repo_ids)
         except:
             # if an exception happened, tear down the application

zine/application.py

@@ -882 +882 @@
         from zine.upgrades.customisation import Repository
 
+        to_upgrade = []
+
         for sv in SchemaVersion.query.all():
             repository = Repository(sv.repository_path, sv.repository_id)
@@ -887 +889 @@
                 self.repository_has_upgrade(repository, sv)
             except _core.InstanceUpgradeRequired:
-                # set Zine in maintenance mode
-                cfg = self.cfg.edit()
-                cfg['maintenance_mode'] = True
-                cfg.commit()
-                raise _core.InstanceUpgradeRequired()
+                to_upgrade.append(sv.repository_id)
+
+        if to_upgrade:
+            # set Zine in maintenance mode
+            cfg = self.cfg.edit()
+            cfg['maintenance_mode'] = True
+            cfg.commit()
+            raise _core.InstanceUpgradeRequired(to_upgrade)
 
         # we got here, let's check for a bad upgrade lockfile left behind

zine/templates/admin/perform_upgrade.html

@@ -115 +115 @@
           this is designed not to corrupt your database, you can back it up
           now before clicking “Perform upgrade”.{% endtrans %}</p>
+      {%- if repo_ids %}
+      <p>{% trans %}Components that need an upgrade:{% endtrans %}
+          {{ repo_ids|join(', ') }}</p> 
+      {%- endif %}
       <br/>
       <form action="" method="POST">

zine/upgrades/webapp.py

@@ -44 +44 @@
     wants_reload = False
 
-    def __init__(self, app):
+    def __init__(self, app, repo_ids=None):
         self.app = app
+        self.repo_ids = repo_ids
         self.database_engine = app.database_engine
         self.lockfile = app.upgrade_lockfile
@@ -134 +135 @@
 
         return render_response(request, 'admin/perform_upgrade.html',
-                               in_progress=isfile(self.lockfile))
+                               in_progress=isfile(self.lockfile),
+                               repo_ids=self.repo_ids)
 
     def __call__(self, environ, start_response):