Return-Path: Delivered-To: apmail-incubator-jspwiki-dev-archive@locus.apache.org Received: (qmail 70301 invoked from network); 24 May 2008 00:54:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 May 2008 00:54:01 -0000 Received: (qmail 83699 invoked by uid 500); 24 May 2008 00:54:03 -0000 Delivered-To: apmail-incubator-jspwiki-dev-archive@incubator.apache.org Received: (qmail 83683 invoked by uid 500); 24 May 2008 00:54:03 -0000 Mailing-List: contact jspwiki-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-dev@incubator.apache.org Received: (qmail 83672 invoked by uid 99); 24 May 2008 00:54:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2008 17:54:02 -0700 X-ASF-Spam-Status: No, hits=2.0 required=10.0 tests=HTML_MESSAGE,NORMAL_HTTP_TO_IP,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of terry@net-frame.com designates 65.212.180.92 as permitted sender) Received: from [65.212.180.92] (HELO pyramid-03.kattare.com) (65.212.180.92) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 May 2008 00:53:14 +0000 Received: from [192.168.1.109] (ip70-187-212-38.dc.dc.cox.net [70.187.212.38]) (authenticated bits=0) by pyramid-03.kattare.com (8.13.8/8.13.6) with ESMTP id m4O0rShL015418 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) for ; Fri, 23 May 2008 17:53:29 -0700 Subject: Re: IE Editing Glitch From: Terry Steichen To: jspwiki-dev@incubator.apache.org In-Reply-To: <1211576974.15135.53.camel@netframe> References: <1211214533.4447.390.camel@netframe> <15cc92000805191034i3dee3f5vcd55322fe997429@mail.gmail.com> <1211223160.4447.408.camel@netframe> <15cc92000805191242h124bf60fr15df342dd5f97895@mail.gmail.com> <2159E6EF-60E7-49E7-B59F-87FBFE6215E9@ecyrd.com> <1211248448.4447.448.camel@netframe> <1211301699.4447.508.camel@netframe> <1211320155.4447.539.camel@netframe> <72681162-01DC-46B3-A1A5-3960CF94E443@ecyrd.com> <1211576974.15135.53.camel@netframe> Content-Type: multipart/alternative; boundary="=-lhMGKoWA33/Mrdy/K2W2" Date: Fri, 23 May 2008 20:52:47 -0400 Message-Id: <1211590367.15135.67.camel@netframe> Mime-Version: 1.0 X-Mailer: Evolution 2.8.3 (2.8.3-2.fc6) X-Virus-Checked: Checked by ClamAV on apache.org --=-lhMGKoWA33/Mrdy/K2W2 Content-Type: text/plain Content-Transfer-Encoding: 7bit Even more fundamentally, when debugging Edit.jsp, when I add this item: , it displays "http://localhost:8080/TC4a/" - even though the jswiki.properties contains this entry: jspwiki.baseURL=http://192.168.1.109:8080/TC4a It appears that - somehow - baseURL isn't being inputted properly. On Fri, 2008-05-23 at 17:09 -0400, Terry Steichen wrote: > Janne, > > Sorry I didn't get to this sooner, but been traveling and having > wireless connection problems. > > Unfortunately your patch doesn't change the error. > > I did some debugging and found that the problem is coming from > wiki.getViewURL(pagereq) [Edit.jsp, line 235]. In this particular case > 'pagereq' is set to "Main" and the value returned by > wiki.getViewURL("Main") is > "http://localhost:8080/TC4a/Wiki.jsp?page=Main". > > Just to verify: I plugged in the actual url > ("http://192.168.1.109:8080/TC4a") and hit Cancel and it worked just > fine. > > I don't have time at the moment to dig into WikiEngine.getViewURL(), but > that's clearly where the problem is. > > Terry > > On Wed, 2008-05-21 at 08:10 +0300, Janne Jalkanen wrote: > > > Terry, can you please try this patch on the current SVN trunk? Might > > work also on the 2.6 branch... > > > > /Janne > > > > Index: /Users/jalkanen/Eclipse/JSPWiki/src/webdocs/Edit.jsp > > =================================================================== > > --- /Users/jalkanen/Eclipse/JSPWiki/src/webdocs/Edit.jsp (revision > > 658385) > > +++ /Users/jalkanen/Eclipse/JSPWiki/src/webdocs/Edit.jsp (working copy) > > @@ -114,7 +114,7 @@ > > log.info("Page changed, warning user."); > > > > session.setAttribute( EditorManager.REQ_EDITEDTEXT, > > EditorManager.getEditedText(pageContext) ); > > - response.sendRedirect( wiki.getURL(WikiContext.CONFLICT, > > pagereq, null, false) ); > > + response.sendRedirect( wiki.getURL(WikiContext.CONFLICT, > > pagereq, null, true) ); > > return; > > } > > > > @@ -184,7 +184,7 @@ > > } > > catch( DecisionRequiredException ex ) > > { > > - String redirect = wikiContext.getURL > > (WikiContext.VIEW,"ApprovalRequiredForPageChanges"); > > + String redirect = wiki.getViewURL > > ("ApprovalRequiredForPageChanges"); > > response.sendRedirect( redirect ); > > return; > > } > > @@ -219,7 +219,7 @@ > > if( htmlText != null ) session.setAttribute > > ( EditorManager.REQ_EDITEDTEXT, text ); > > > > session.setAttribute("changenote", changenote != null ? > > changenote : "" ); > > - response.sendRedirect( wiki.getURL > > (WikiContext.PREVIEW,pagereq,null,false) ); > > + response.sendRedirect( wiki.getURL > > (WikiContext.PREVIEW,pagereq,null,true) ); > > return; > > } > > else if( cancel != null ) --=-lhMGKoWA33/Mrdy/K2W2--