xlawrence 2005/11/28 18:54:44 CET
Modified files:
core/src/java/org/jahia/engines/updatefield
UpdateField_Engine.java
core/src/webapp/jsp/jahia/engines/updatefield updatefield.jsp
Log:
- don't show metadata engine when updating a field
- fixed position of apply to all languages checkbox
Revision Changes Path
1.20 +0 -2
jahia/core/src/java/org/jahia/engines/updatefield/UpdateField_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/updatefield/UpdateField_Engine.java.diff?r1=1.19&r2=1.20&f=h
1.14 +1 -1
jahia/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp.diff?r1=1.13&r2=1.14&f=h
Index: UpdateField_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/updatefield/UpdateField_Engine.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- UpdateField_Engine.java 12 Oct 2005 12:23:25 -0000 1.19
+++ UpdateField_Engine.java 28 Nov 2005 17:54:44 -0000 1.20
@@ -133,7 +133,6 @@
final JahiaUser user = jParams.getUser();
if (theField.checkAdminAccess (user)) {
engineMap.put("enableAuthoring", Boolean.TRUE);
- engineMap.put("enableMetadata", Boolean.TRUE);
engineMap.put ("adminAccess", Boolean.TRUE);
engineMap.put ("enableRightView", Boolean.TRUE);
// engineMap.put("enableContentDefinition", Boolean.TRUE);
@@ -141,7 +140,6 @@
engineMap.put ("writeAccess", Boolean.TRUE);
} else if (theField.checkWriteAccess (user)) {
engineMap.put("enableAuthoring", Boolean.TRUE);
- engineMap.put("enableMetadata", Boolean.TRUE);
engineMap.put ("writeAccess", Boolean.TRUE);
// engineMap.put("enableContentDefinition", Boolean.TRUE);
}
Index: updatefield.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- updatefield.jsp 28 Nov 2005 17:27:55 -0000 1.13
+++ updatefield.jsp 28 Nov 2005 17:54:44 -0000 1.14
@@ -144,7 +144,7 @@
<%
boolean applyChangeToAllLang =
(request.getParameter("apply_change_to_all_lang_" + theField.getID()) != null);
if (theField instanceof JahiaAllowApplyChangeToAllLangField)
{ %>
- <% if (localeList.size() > 1) { %>
+ <% if (localeList.size() > 1) { %> <br/>
<input type="checkbox"
name="apply_change_to_all_lang_<%=theField.getID()%>"
value="<%=theField.getID()%>"
<% if (theField.isShared()) { %>
