Author: ktlili
Date: Sun Nov 25 20:26:22 2007
New Revision: 19282
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19282&repname=
=3Djahia
Log:
- commit portlets categories( admin view ): classes + categories
Modified:
trunk/core/src/java/org/jahia/ajax/categories/AbstractCategoryAction.ja=
va
trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren.java
Modified: trunk/core/src/java/org/jahia/ajax/categories/AbstractCategoryAct=
ion.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/ajax/categories/AbstractCategoryAction.java&rev=3D19282&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
--- trunk/core/src/java/org/jahia/ajax/categories/AbstractCategoryAction.ja=
va (original)
+++ trunk/core/src/java/org/jahia/ajax/categories/AbstractCategoryAction.ja=
va Sun Nov 25 20:26:22 2007
@@ -120,6 +120,40 @@
root.appendChild(item);
}
=
+ protected void attachCategoryForPortletToResp(final Category cat,
+ final Document resp,
+ final Element root,
+ final ProcessingContext =
jParams,
+ final List selectedCateg=
ories,
+ final List categoriesIsM=
ultipleSrcList) {
+
+ logger.debug("attachCategoryForPortletToResp - selectedCategories:=
" + selectedCategories);
+ final String id =3D cat.getObjectKey().getIDInType();
+ final Element item =3D resp.createElement(CATEGORY);
+ final String title =3D cat.getTitle(jParams.getLocale());
+ final String key =3D cat.getKey();
+ final String leafName;
+ if (title =3D=3D null) {
+ leafName =3D "(key: " + key + ")";
+ } else {
+ leafName =3D "(key: " + key + ") " + title;
+ }
+ item.setAttribute(TITLE, leafName);
+ item.setAttribute(KEY, key);
+ item.setAttribute("id", id);
+
+ if (selectedCategories !=3D null && selectedCategories.contains(ca=
t.getKey())) {
+ item.setAttribute("checked", "checked");
+ }
+
+ if (categoriesIsMultipleSrcList !=3D null && categoriesIsMultipleS=
rcList.contains(cat.getKey())) {
+ logger.debug("set allsources to true");
+ item.setAttribute("allsources", "true");
+ }
+
+ root.appendChild(item);
+ }
+
protected void attachCategoryforAdminToResp(final Category cat,
final Document resp,
final Element root,
Modified: trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/ajax/categories/GetCategoryChildren.java&rev=3D19282&repname=3Djah=
ia
=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
--- trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren.java =
(original)
+++ trunk/core/src/java/org/jahia/ajax/categories/GetCategoryChildren.java =
Sun Nov 25 20:26:22 2007
@@ -23,6 +23,7 @@
import org.jahia.data.fields.JahiaField;
import org.jahia.engines.filemanager.TableEntry;
import org.jahia.engines.shared.Category_Field;
+import org.jahia.engines.applications.ManageApplicationCategoriesEngine;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ProcessingContext;
import org.jahia.params.SessionState;
@@ -69,6 +70,9 @@
final String admin =3D getParameter(request, "admin", "");
final String move =3D getParameter(request, "move", "");
final String objectKey =3D getParameter(request, "display", ""=
);
+ final String portletCategories =3D getParameter(request, Manag=
eApplicationCategoriesEngine.PORLET_CATEGORIES, "");
+ final boolean isPortletCategoriesContext =3D portletCategories=
!=3D null && portletCategories.equalsIgnoreCase(ManageApplicationCategorie=
sEngine.PORLET_CATEGORIES_TRUE);
+
final boolean isAdmincontext =3D admin.length() > 0;
if (isAdmincontext) {
if (aclService.getServerActionPermission("admin.categories=
.ManageCategories",
@@ -116,6 +120,13 @@
} else if (isMovecontext) {
attachCategoryToResp(startingCategory, resp, root,=
jParams);
=
+ } else if (isPortletCategoriesContext) {
+ // we are dealing with portlet
+ logger.debug("deal with portlets category");
+ final List selectedCategories =3D getSelectedPortl=
etsCategories(jParams);
+ final List categoriesIsMultipleSrcList =3D getSele=
ctedPortletsAllsourcesCategories(jParams);
+ attachCategoryForPortletToResp(startingCategory, r=
esp, root, jParams, selectedCategories,
+ categoriesIsMultipleSrcList);
} else {
if (objectKey.startsWith("/")) {
// we are dealing with a DAV resource
@@ -162,7 +173,16 @@
attachCategoryToResp((Category) ite.next(), resp, root=
, jParams);
}
=
- } else {
+ } else if (isPortletCategoriesContext) {
+ // we are dealing with portlet
+ logger.debug("Dealing with a portlet.");
+ while (ite.hasNext()) {
+ final List selectedCategories =3D getSelectedPortletsC=
ategories(jParams);
+ final List categoriesIsMultipleSrcList =3D getSelected=
PortletsAllsourcesCategories(jParams);
+ attachCategoryForPortletToResp((Category) ite.next(), =
resp, root, jParams, selectedCategories,categoriesIsMultipleSrcList);
+ }
+
+ }else { =
if (objectKey.startsWith("/")) {
// we are dealing with a DAV resource
while (ite.hasNext()) {
@@ -193,6 +213,7 @@
return null;
}
=
+
protected List getSelectedCategories(final ProcessingContext jParams) =
throws JahiaException, ClassNotFoundException {
final SessionState session =3D jParams.getSessionState();
final Map engineMap =3D (Map) session.getAttribute("jahia_session_=
engineMap");
@@ -204,4 +225,20 @@
}
return new ArrayList();
}
+
+ protected List getSelectedPortletsCategories(final ProcessingContext =
jParams){
+ List result =3D (List) jParams.getSessionState().getAttribute("org=
.jahia.engines.applications.ManageApplicationCategoriesEngine.categoriesKey=
List");
+ if (result =3D=3D null) {
+ return new ArrayList();
+ }
+ return result;
+ }
+
+ protected List getSelectedPortletsAllsourcesCategories(final Processi=
ngContext jParams){
+ List result =3D (List) jParams.getSessionState().getAttribute("org=
.jahia.engines.applications.ManageApplicationCategoriesEngine.allSourcesCat=
egoriesKeyList");
+ if (result =3D=3D null) {
+ return new ArrayList();
+ }
+ return result;
+ }
}
\ No newline at end of file
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
