Changeset 927

Timestamp:

09.03.2010 21:43:48 (2 years ago)

Author:

zmsdev

Message:

Added support for overwriting configuration of $ZMS_HOME/www/themes.zcml by $INSTANCE_HOME/etc/zms/www/themes.zcml

Location:

ZMS/trunk

Files:

• _globals.py (modified) (1 diff)
• changes.txt (modified) (1 diff)
• configure.zcml (added)
• manage_addzmsform.dtml (modified) (2 diffs)
• version.txt (modified) (1 diff)

ZMS/trunk/_globals.py

@@ -827 +827 @@
     return self.__attr_conf_dict__.get(key,default)
 
+  def import_instance_home(self, this, url):
+    path = this.Control_Panel.getINSTANCE_HOME()+'/etc/zms/'+url
+    mode = 'b'
+    if os.path.exists(path):
+      f = None
+      try:
+        f = open( path, 'r'+mode)
+        data = f.read()
+      finally:
+        if f is not None:
+          f.close()
+      return data
+    return None
+
   def http_import(self, url, method='GET', auth=None, parse_qs=0):
     return http_import( self, url, method, auth, parse_qs)

ZMS/trunk/changes.txt

@@ -1475 +1475 @@
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 --------------------------------------------------
+2010-03-09:zms2-2.12.1-18
+[01320] Added support for overwriting configuration of $ZMS_HOME/www/themes.zcml by $INSTANCE_HOME/etc/zms/www/themes.zcml(requested by xm).
+--------------------------------------------------

ZMS/trunk/manage_addzmsform.dtml

@@ -154 +154 @@
   <select class="form-element" name="theme:required" onchange="themeChange(this);" onkeyup="themeChange(this);">
 
-    <dtml-in "_.range(99)" reverse>
+    <dtml-in "range(99)" reverse>
      <dtml-let idx=sequence-item>
       <dtml-try>
@@ -169 +169 @@
      <dtml-call "REQUEST.set('default_img_theme','spacer.gif')">
     </dtml-unless>
-    <dtml-call "REQUEST.set('themes',misc_.zms['initutil'].http_import('%s/misc_/zms/themes.zcml'%BASE0.replace('https','http')))">
+    <dtml-call "REQUEST.set('themes',None)">
+    <dtml-if "REQUEST.get('themes') is None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].import_instance_home(this(),'www/themes.zcml'))"></dtml-if>
+    <dtml-if "REQUEST.get('themes') is None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].http_import('%s/misc_/zms/themes.zcml'%BASE0.replace('https','http')))"></dtml-if>
     <dtml-call "REQUEST.set('themes',misc_.zms['initutil'].re_search('source location=\042(.*?)\042/>',themes))">
     <dtml-in themes>

ZMS/trunk/version.txt

@@ -1 @@
-ZMS2 2.12.1-16
+ZMS2 2.12.1-18