Author: bpapez
Date: Mon Oct  1 19:06:38 2007
New Revision: 18719

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18719&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2426: SP3: Preview mode on a page wi=
thout translation generates a 403 error
- return null in JahiaPage constructor if title is null, only for requests =
in NORMAL mode

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.i=
nc

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/top=
menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.inc&rev=3D18719&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.i=
nc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/topbar/topmenu.i=
nc Mon Oct  1 19:06:38 2007
@@ -176,23 +176,12 @@
                                                                }
                                                        }
                                        }
-
-                        if  (jData.gui().isPreviewMode()){
-                                                       if ( 
pageTitles.containsKey(languageCode) ){
-                                   if (languageState !=3D null){
-                                       %>
-<div class=3D"workflowState"><jahia:displayLanguageFlag code=3D"<%=3Dlangu=
ageCode%>" href=3D'<%=3DcurrentLanguageCode.equals(languageCode) ? "" : jDa=
ta.gui().drawPageLanguageSwitch(languageCode)%>' alt=3D"<%=3DlanguageName%>=
"/><jahia:displayIcon src=3D"<%=3DlanguageState.toString()%>" lang=3D"<%=3D=
languageCode%>"/></div>
-<%
-                                   }
-                               }
-                        } else {
-                            %><div class=3D"workflowState"><jahia:displayL=
anguageFlag code=3D"<%=3DlanguageCode%>"
+                           %><div class=3D"workflowState"><jahia:displayLa=
nguageFlag code=3D"<%=3DlanguageCode%>"
                                 href=3D'<%=3DcurrentLanguageCode.equals(la=
nguageCode) ? "" : jData.gui().drawPageLanguageSwitch(languageCode)%>'
                                 alt=3D"<%=3DlanguageName%>"/><%
                                 if (languageState !=3D null /*&& wf_visu.t=
rim().equalsIgnoreCase("true")*/) {
                                     %><jahia:displayIcon src=3D"<%=3Dlangu=
ageState.toString()%>" lang=3D"<%=3DlanguageCode%>"/><%
                                 } %></div><%
-                        }
                     }
                 }//end while
             }

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to