Author: cmailleux
Date: Tue Aug 8 15:22:27 2006
New Revision: 14861
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14861&repname=jahia
Log:
Check the childs as it was removed when going to a unique topbar in jahia
instead of one per template
Modified:
trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc
Modified: trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc
URL:
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc&rev=14861&repname=jahia
==============================================================================
--- trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc Tue Aug 8
15:22:27 2006
@@ -1,22 +1,22 @@
-<%--
-Copyright 2002-2006 Jahia Ltd
-
-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDDL),
-Version 1.0 (the "License"), or (at your option) any later version; you may
-not use this file except in compliance with the License. You should have
-received a copy of the License along with this program; if not, you may obtain
-a copy of the License at
-
- http://www.jahia.org/license/
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+<%--
+Copyright 2002-2006 Jahia Ltd
+
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDDL),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may obtain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
--%><%
- if (jData.page().checkWriteAccess(user)
- || (jData.page().checkAdminAccess(user) &&
jData.page().checkReadAccess(user))) {
+ if (jData.page().checkWriteAccess(user,true)
+ || (jData.page().checkAdminAccess(user,true) &&
jData.page().checkReadAccess(user))) {
%>
<div class="tab">
<ul>
@@ -89,7 +89,7 @@
}
// Display Edit button
- if (jData.page().checkWriteAccess(user)) {
+ if (jData.page().checkWriteAccess(user,true)) {
String editUrl = jData.gui().drawEditModeLink();
%>
<li <%= jData.gui().isEditMode() ? "class='selected'" : ""%>>
