Fixed recursive module calling for content versions when configuratio…

…n changed
cliftonc · Jun 19, 2011 · 93697fc · 93697fc
1 parent 443a140
commit 93697fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/modules/core/admin/templates/reload.html b/modules/core/admin/templates/reload.html
@@ -2,8 +2,9 @@
     <script>
 	//TODO add flash notice to show update has taken place
 	//TODO add page names to admin form options, pass that here to redirect back to where we came from
-      $(document).ready(function() {	    
-		window.location.replace("/admin/core/config");
+   $(document).ready(function() {	    
+		// window.location.replace("/admin/core/config");
 	});
-    </script>
+   </script>
+   <a href="/admin/core/config">Return ...</a>
 </div>
diff --git a/modules/core/contentVersions/contentVersions.module.js b/modules/core/contentVersions/contentVersions.module.js
@@ -68,6 +68,12 @@ function init(module,app,next) {
         });
 
         // Form alteration
+        if(calipso.modules.content.fn.originalContentForm) {
+          // We have already altered the form, so lets set it back before altering it
+          calipso.modules.content.fn.contentForm = calipso.modules.content.fn.originalContentForm;  
+        }
+
+        // Now, lets alter the form
         calipso.modules.content.fn.originalContentForm = calipso.modules.content.fn.contentForm;
         calipso.modules.content.fn.contentForm = function() {            
           var form = calipso.modules.content.fn.originalContentForm();