[Erp5-report] r44217 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Mar 11 21:23:20 2011
New Revision: 44217

URL: http://svn.erp5.org?rev=44217&view=rev
Log:
don't load ERP5 System Preference to UNG Settings

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getPreferencePathList.xml
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getPreferencePathList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getPreferencePathList.xml?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getPreferencePathList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/Base_getPreferencePathList.xml [utf8] Fri Mar 11 21:23:20 2011
@@ -57,16 +57,12 @@ if context.portal_membership.isAnonymous
 \n
 portal_preferences = context.portal_preferences\n
 preference = portal_preferences.getActivePreference()\n
-system_preference = portal_preferences.getActiveSystemPreference()\n
 \n
 preference_dict = {}\n
 \n
 if preference:\n
   preference_dict["preference"] = preference.getRelativeUrl()\n
 \n
-if system_preference:\n
-  preference_dict["system_preference"] = system_preference.getRelativeUrl()\n
-\n
 return dumps(preference_dict)\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Fri Mar 11 21:23:20 2011
@@ -373,8 +373,8 @@ $().ready(function(){\n
   });\n
   $("div#preference_dialog").dialog({\n
     autoOpen: false,\n
-    height: 480,\n
-    width: 330,\n
+    height: 215,\n
+    width: 319,\n
     modal:true,\n
     buttons: {\n
       "Save": function(){\n
@@ -383,11 +383,6 @@ $().ready(function(){\n
           url: ungPreferencePath + "/Base_edit",\n
           data: erp5PreferenceArgument + "&form_id=Preference_viewHtmlStyle",\n
         });\n
-        var systemPreferenceArgument = $("form#system_preference").serialize();\n
-        $.ajax({\n
-          url: systemPreferencePath + "/Base_edit",\n
-          data: systemPreferenceArgument + "&form_id=SystemPreference_view",\n
-        });\n
         var ungPreferenceArgument = $("form#ung_preference").serialize();\n
         $.ajax({\n
           url: ungPreferencePath + "/Base_edit",\n
@@ -432,19 +427,12 @@ $().ready(function(){\n
       if ($("div#preference_dialog").html() == ""){\n
         $.getJSON("Base_getPreferencePathList", function(data){\n
           ungPreferencePath = data.preference;\n
-          systemPreferencePath = data.system_preference;\n
           $.get(ungPreferencePath + \'/Preference_viewHtmlStyle?editable_mode:int=1\', function(data){\n
             $("div#preference_dialog").append("<form id=\'erp5_preference\'>" + \n
                                               "<fieldset class=\'center editable\'>" + \n
                                               $(data).find(\'fieldset.center.editable\').html() +\n
                                               "</fieldset></form>");\n
           });\n
-          $.get(systemPreferencePath + \'/SystemPreference_view?editable_mode:int=1\', function(data){\n
-            $("div#preference_dialog").append("<form id=\'system_preference\'>" + \n
-                                              "<fieldset class=\'right editable\'>" + \n
-                                              $(data).find(\'fieldset.right.editable\').html() +\n
-                                              "</fieldset></form>");\n
-          });\n
           $.get(ungPreferencePath + \'/UNGPreference_view?editable_mode:int=1\', function(data){  \n
             $("div#preference_dialog").append("<form id=\'ung_preference\'>" + \n
                                               "<fieldset class=\'center editable\'>" + \n

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Fri Mar 11 21:23:20 2011
@@ -1 +1 @@
-292
\ No newline at end of file
+293
\ No newline at end of file