fixed an issue with the page form

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@549 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 5f029d32e22ca2c76fc99ff1721927e5c4c7b78f..1219022f69acf4f50a5e8b6b30448fcf869a4964 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-12  Helge Hess  <helge.hess@opengroupware.org>
 
+       * UIxMailMainFrame.m: fixed page form processing if the active URL
+         does not specify a method name (ends with /) (v0.9.101)
+
        * v0.9.100
 
        * added support for filter popup (OGo bug #1210)

diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.m b/SOGo/UI/Mailer/UIxMailMainFrame.m
index 2a732b69156627a4d3445af3d6895b1d3944be7d..1c7c006bb541d0c3e60a16bce90eea7143cc4027 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailMainFrame.m
+++ b/SOGo/UI/Mailer/UIxMailMainFrame.m
@@ -75,6 +75,13 @@
   return self->item;
 }
 
+- (NSString *)pageFormURL {
+  NSString *u;
+  
+  u = [[[self context] request] uri];
+  return [u hasSuffix:@"/"] ? @"view" : @"#";
+}
+
 /* notifications */
 
 - (void)sleep {

diff --git a/SOGo/UI/Mailer/UIxMailMainFrame.wox b/SOGo/UI/Mailer/UIxMailMainFrame.wox
index 652848a276e7451884b4f06a87c0c38a654fbad0..71760e4dd8d63c431b2095e87892497e4f7edd91 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailMainFrame.wox
+++ b/SOGo/UI/Mailer/UIxMailMainFrame.wox
@@ -25,7 +25,7 @@
    <!-- 
      Note: the 'href' is required, otherwise an element-id will get created
      -->
-   <form name="pageform" href="#" sidInUrl="NO">
+   <form name="pageform" var:href="pageFormURL" sidInUrl="NO">
     <table border="0" width="100%" cellspacing="0" cellpadding="2"
            style="position: fixed; height: 48px; z-index: 100;"
     >

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index aa1272eacc27551979755f69c9fefad961068135..529aca4c88391ebfe32234e0cdc00172fc942fe9 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=100
+SUBMINOR_VERSION:=101
 
 # v0.9.100 requires libNGMime        v4.5.213
 # v0.9.99  requires libNGMime        v4.5.212