knguyen 2004/10/27 17:02:44 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/fields JahiaFieldBaseService.java
src/java/org/jahia/services/search
JahiaSearchResultHandlerImpl.java
src/views/jsp/jahia/htmleditors/htmlarea/lang es.js
Log:
- field loading and entryload request fix
- search result fix
Revision Changes Path
1.104.2.8 +17 -1
jahia/src/java/org/jahia/services/fields/JahiaFieldBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/fields/JahiaFieldBaseService.java.diff?r1=1.104.2.7&r2=1.104.2.8&f=h
1.2.2.5 +2 -1
jahia/src/java/org/jahia/services/search/JahiaSearchResultHandlerImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/JahiaSearchResultHandlerImpl.java.diff?r1=1.2.2.4&r2=1.2.2.5&f=h
1.1.2.2 +9 -9 jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/es.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/es.js.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
Index: JahiaFieldBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/fields/Attic/JahiaFieldBaseService.java,v
retrieving revision 1.104.2.7
retrieving revision 1.104.2.8
diff -u -r1.104.2.7 -r1.104.2.8
--- JahiaFieldBaseService.java 20 Oct 2004 09:46:06 -0000 1.104.2.7
+++ JahiaFieldBaseService.java 27 Oct 2004 15:02:43 -0000 1.104.2.8
@@ -747,6 +747,22 @@
return null;
}
+ if (contentField == null) {
+ contentField = ContentField.getField(fieldID);
+ }
+ if ( loadVersion.isCurrent()
+ && theField.getWorkflowState() !=
EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
+ // we only allow live data
+ return null;
+ } else if ( loadVersion.isStaging() ){
+ if (!loadVersion.isWithMarkedForDeletion()
+ && contentField.isMarkedForDelete(theField.getLanguageCode())) {
+ // we don't want marked for delete data
+ return null;
+ }
+ }
+
+ /* Doesn't work with engine like "searchengine"
if ( theField != null
&& !"core".equalsIgnoreCase(jParams.getEngine()) ){
// we found an active but we need to check that it is not marked for
delete
@@ -756,7 +772,7 @@
if ( contentField.isMarkedForDelete(theField.getLanguageCode()) ){
return null;
}
- }
+ }*/
// check fields ACL
if (jParams == null) {
Index: JahiaSearchResultHandlerImpl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/search/Attic/JahiaSearchResultHandlerImpl.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- JahiaSearchResultHandlerImpl.java 25 Oct 2004 16:22:52 -0000 1.2.2.4
+++ JahiaSearchResultHandlerImpl.java 27 Oct 2004 15:02:43 -0000 1.2.2.5
@@ -262,7 +262,8 @@
return false;
}
if ( jParams.getEntryLoadRequest ().isCurrent ()
- && workflowState == EntryLoadRequest.ACTIVE_WORKFLOW_STATE ){
+ && workflowState == EntryLoadRequest.ACTIVE_WORKFLOW_STATE
+ && contentField.hasActiveEntries()){
processField = true;
} else if ( jParams.getEntryLoadRequest().isStaging()
&& !contentField.isMarkedForDelete() ){
Index: es.js
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/htmleditors/htmlarea/lang/Attic/es.js,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- es.js 29 Sep 2004 16:47:41 -0000 1.1.2.1
+++ es.js 27 Oct 2004 15:02:43 -0000 1.1.2.2
@@ -1,4 +1,4 @@
-// I18N constants
+// I18N constants
HTMLArea.I18N = {
@@ -11,19 +11,19 @@
italic: "Cursiva",
underline: "Subrayado",
strikethrough: "Tachado",
- subscript: "Sub�ndice",
- superscript: "Super�ndice",
+ subscript: "Subíndice",
+ superscript: "Superíndice",
justifyleft: "Alinear a la Izquierda",
justifycenter: "Centrar",
justifyright: "Alinear a la Derecha",
justifyfull: "Justificar",
insertorderedlist: "Lista Ordenada",
insertunorderedlist: "Lista No Ordenada",
- outdent: "Aumentar Sangr�a",
- indent: "Disminuir Sangr�a",
+ outdent: "Aumentar Sangría",
+ indent: "Disminuir Sangría",
forecolor: "Color del Texto",
hilitecolor: "Color del Fondo",
- inserthorizontalrule: "L�nea Horizontal",
+ inserthorizontalrule: "Línea Horizontal",
createlink: "Insertar Enlace",
insertimage: "Insertar Imagen",
inserttable: "Insertar Tabla",
@@ -34,8 +34,8 @@
textindicator: "Estilo Actual",
undo: "Deshacer",
redo: "Rehacer",
- cut: "Cortar selecci�n",
- copy: "Copiar selecci�n",
+ cut: "Cortar selección",
+ copy: "Copiar selección",
paste: "Pegar desde el portapapeles"
},
@@ -46,6 +46,6 @@
msg: {
"Path": "Ruta",
- "TEXT_MODE": "Esta en modo TEXTO. Use el boton [<>] para cambiar a
WYSIWIG",
+ "TEXT_MODE": "Esta en modo TEXTO. Use el boton [<>] para cambiar a
WYSIWIG"
}
};
