svn commit: r1075310 - in /ofbiz/trunk/applications/content/webapp/content: content/ContentNav.ftl content/DisplayContentNav.ftl content/nav.ftl website/WebSiteCMSNav.ftl

[sascharodekamp]

Author: sascharodekamp
Date: Mon Feb 28 12:08:26 2011
New Revision: 1075310

URL: http://svn.apache.org/viewvc?rev=1075310&view=rev
Log:
Bug - Content Tree is not shown in IE7 (https://issues.apache.org/jira/browse/OFBIZ-3815). The JSON Object was not defined in a clean way so the IE couldn't interprete the structure.
Thnkas Ankit for reporting!

Orig. Msg.:
We have two issues:
 1. https://demo-trunk.ofbiz.apache.org:8443/content/control/findContent, the alert box open and say "Operation Aborted". see Image1.jpg

#Here https://demo-trunk.ofbiz.apache.org:8443/content/control/navigateContent the tree is not rendering. see Image2.jpg

Both the above issue are on IE7 only they are working fine on FF and Chrome.

I have attached the two images please have a look.

Modified:
    ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl
    ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl
    ofbiz/trunk/applications/content/webapp/content/content/nav.ftl
    ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl

Modified: ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl?rev=1075310&r1=1075309&r2=1075310&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl Mon Feb 28 12:08:26 2011
@@ -39,9 +39,9 @@ var rawdata = [
                 {
                 "data": {"title" : unescapeHtmlText("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}},
                 <#assign assocChilds  = delegator.findByAnd("ContentAssoc",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId",assoc.contentIdTo,"contentAssocTypeId", "TREE_CHILD"))/>
-                    "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "AssocType" : "${assoc.contentAssocTypeId}", "fromDate" : "${assoc.fromDate}"},
+                    "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "AssocType" : "${assoc.contentAssocTypeId}", "fromDate" : "${assoc.fromDate}"}
                 <#if assocChilds?has_content>
-                    "children": [
+                    ,"children": [
                         <@fillTree assocList = assocChilds/>
                     ]
                 </#if>

Modified: ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl?rev=1075310&r1=1075309&r2=1075310&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl Mon Feb 28 12:08:26 2011
@@ -40,9 +40,9 @@ var rawdata = [
                 {
                 "data": {"title" : unescapeHtmlText("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}},
                 <#assign assocChilds  = delegator.findByAnd("ContentAssoc",Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId",assoc.contentIdTo,"contentAssocTypeId", "TREE_CHILD"), Static["org.ofbiz.base.util.UtilMisc"].toList("sequenceNum"))/>
-                    "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "AssocType" : "${assoc.contentAssocTypeId}", "fromDate" : "${assoc.fromDate}"},
+                    "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "AssocType" : "${assoc.contentAssocTypeId}", "fromDate" : "${assoc.fromDate}"}
                 <#if assocChilds?has_content>
-                    "children": [
+                    ,"children": [
                         <@fillTree assocList = assocChilds/>
                     ]
                 </#if>

Modified: ofbiz/trunk/applications/content/webapp/content/content/nav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/nav.ftl?rev=1075310&r1=1075309&r2=1075310&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/content/nav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/content/nav.ftl Mon Feb 28 12:08:26 2011
@@ -36,10 +36,10 @@ var rawdata = [
           <#if (assocList?has_content)>
             <#list assocList as assoc>
                 {
-                "data": {"title" : unescapeHtmlText("${assoc.categoryName!assoc.dataCategoryId!}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.dataCategoryId!}');"}},
+                "data": {"title" : unescapeHtmlText("${assoc.categoryName!assoc.dataCategoryId!}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.dataCategoryId!}');"}}
                 <#assign assocs = assoc.getRelated("ChildDataCategory")?if_exists/>
                 <#if assocChilds?has_content>
-                    "children": [
+                    ,"children": [
                         <@fillTree assocList = assocChilds/>
                     ]
                 </#if>

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1075310&r1=1075309&r2=1075310&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Mon Feb 28 12:08:26 2011
@@ -53,9 +53,9 @@ var rawdata_subsites = [
                     {
                     "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}},
                     <#assign assocChilds  = content.getRelated("FromContentAssoc")?if_exists/>
-                        "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"},
+                        "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
                     <#if assocChilds?has_content>
-                        "children": [
+                        ,"children": [
                             <@fillTree assocList = assocChilds/>
                         ]
                     </#if>
@@ -80,9 +80,9 @@ var rawdata_menus = [
                     {
                     "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}},
                     <#assign assocChilds  = content.getRelated("FromContentAssoc")?if_exists/>
-                        "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"},
+                        "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
                     <#if assocChilds?has_content>
-                        "children": [
+                        ,"children": [
                             <@fillTree assocList = assocChilds/>
                         ]
                     </#if>
@@ -107,9 +107,9 @@ var rawdata_errors = [
                     {
                     "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}},
                     <#assign assocChilds  = content.getRelated("FromContentAssoc")?if_exists/>
-                        "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"},
+                        "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"}
                     <#if assocChilds?has_content>
-                        "children": [
+                        ,"children": [
                             <@fillTree assocList = assocChilds/>
                         ]
                     </#if>
@@ -130,7 +130,7 @@ var rawdata_errors = [
         jQuery("#subsites").jstree({
             "plugins" : [ "themes", "json_data", "ui", "contextmenu", "crrm"],
             "core" : {
-                "html_titles" : true,
+                "html_titles" : true
             },
             "ui" : {
                 "initially_select" : ["${parameters.contentId!}"]
@@ -198,7 +198,7 @@ var rawdata_errors = [
         jQuery("#menus").jstree({
             "plugins" : [ "themes", "json_data", "ui", "contextmenu", "crrm"],
             "core" : {
-                "html_titles" : true,
+                "html_titles" : true
             },
             "json_data" : {
                 "data" : rawdata_menus,
@@ -263,7 +263,7 @@ var rawdata_errors = [
         jQuery("#errors").jstree({
             "plugins" : [ "themes", "json_data", "ui", "contextmenu", "crrm"],
             "core" : {
-                "html_titles" : true,
+                "html_titles" : true
             },
             "json_data" : {
                 "data" : rawdata_errors,