Author: ktlili
Date: Wed Jun 20 09:59:40 2007
New Revision: 17657
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17657&repname=
=3Djahia
Log:
- fix bug (no jira, only sp): show unautuh. msg when searching a portlet an=
d current selected portlet is not allowed for current user
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D17657&=
repname=3Djahia
=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/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Wed Jun 20 09:59:40 2007
@@ -691,7 +691,7 @@
org.jahia.engines.shared.Application_Field_displyTag.search.label =3D Rech=
ercher un portlet
org.jahia.engines.shared.Application_Field_displyTag.searchBy.label =3D par
org.jahia.engines.shared.Application_Field_displyTag.selectedPortlet.label=
=3D La portlet s=C3=A9lectionn=C3=A9e est:
-org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D d=C3=A9selectionner
+org.jahia.engines.shared.Application_Field_displyTag.unselectedPortlet.lab=
el =3D d=C3=A9s=C3=A9lectionner
=
org.jahia.engines.shared.BigText_Field.WAIwarning.label =3D Avertissement(=
s) WAI
org.jahia.engines.shared.BigText_Field.alignCenter.label =3D Alignement au=
centre
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Application_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Application_Field.java&rev=
=3D17657&repname=3Djahia
=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/java/org/jahia/engines/shared/App=
lication_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java Wed Jun 20 09:59:40 2007
@@ -499,10 +499,14 @@
logger.debug("No portlet selected. ");
}
=
- if (authAppList.size() > 0 && appBean !=3D null && !authAppLis=
t.contains(appBean)) {
+
+ }
+
+ // set auth flag
+ if (authAppList!=3Dnull && authAppList.size() > 0 && appBean !=3D =
null && !authAppList.contains(appBean)) {
engineMap.put(theField.getDefinition().getName() + "_unAut=
horized", Boolean.TRUE);
- }
}
+
Vector roles =3D new Vector();
if (appID >=3D 0) {
WebAppContext appContext =3D ServicesRegistry.getInstance().
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field_displayTag.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field_displayT=
ag.inc&rev=3D17657&repname=3Djahia
=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/engines/shared/a=
pplication_field_displayTag.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field_displayTag.inc Wed Jun 20 09:59:40 2007
@@ -150,7 +150,7 @@
// set counter value
counter =3D resultRows.size();
=
-
+ // get parameter for display tag
request.setAttribute( "resultRows",resultRows);
ParamEncoder encoder =3D new ParamEncoder(tableId);
String paramPageName =3D encoder.encodeParameterName(TableTagParameter=
s.PARAMETER_PAGE);
@@ -162,10 +162,20 @@
String paramOrder =3D encoder.encodeParameterName(TableTagParameters.PA=
RAMETER_ORDER);
String paramOrderValue =3D request.getParameter(paramOrder);
=
- String selectedName =3D "";
- String selectedContextName =3D "";
- String selectedDescription =3D "";
- String selectedFieldId =3D "";
+ // get selected field id
+ String selectedFieldId =3D null;
+ if(jParams !=3Dnull){
+ selectedFieldId =3D jParams.getParameter("_" + Integer.toString(th=
eField.getID()));
+ }
+ if(selectedFieldId =3D=3D null || selectedFieldId.equalsIgnoreCase("")=
){
+ if(appID!=3D -1 && selectedEntryPointDefName!=3D null && !selected=
EntryPointDefName.equalsIgnoreCase("") ){
+ selectedFieldId =3D appID+"_"+selectedEntryPointDefName;
+ }
+ }
+ if(selectedFieldId =3D=3D null){
+ selectedFieldId =3D "";
+ }
+
=
%>
=
@@ -220,9 +230,6 @@
=
if(isSelected){
selectedStyle =3D "color:#5F77B0;
font-weight: bold;";
- selectedName =3D name;
- selectedContextName =3D contextName;
- selectedDescription =3D description;
selectedFieldId =3D currentFieldId;
}
%>
@@ -245,7 +252,7 @@
=
<display:footer>
<tr>
- <td><input style=3D"display:none;"
id=3D"<%=3DselectedFieldId%>" name=
=3D"_<%=3DtheField.getID()%>" value=3D"<%=3DselectedFieldId%>" type=3D"rad=
io" onchange=3D"javascript:check();javascript:handleActionChange('edit');" =
checked /> </td>
+ <td><input style=3D"display:none;" id=3D"<%=3DselectedFieldId%=
>" name=3D"_<%=3DtheField.getID()%>" value=3D"<%=3DselectedFieldId%>" type=
=3D"radio" onchange=3D"javascript:check();javascript:handleActionChange('ed=
it');" checked /> </td>
<td></td>
<td></td>
<tr>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
