From a27c7e60cb233d220fa249f7586afc82c6d57597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Tue, 30 Oct 2012 13:57:48 +0100 Subject: [PATCH] Avoid object creation. The promise will always fail, unless there is active system preference to fix. --- .../erp5_promise/Alarm_installPromiseConversionServer.xml | 5 +---- bt5/erp5_promise/bt/revision | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installPromiseConversionServer.xml b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installPromiseConversionServer.xml index 193a0d68d41..905730ff22e 100644 --- a/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installPromiseConversionServer.xml +++ b/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_installPromiseConversionServer.xml @@ -60,10 +60,7 @@ domain = domain_port[:-(len(port)+1)]\n \n system_preference = portal_preferences.getActiveSystemPreference()\n if system_preference is None:\n - system_preference = portal_preferences.newContent(\n - portal_type="System Preference", \n - title="Created by Promise Alarms")\n - system_preference.enable()\n + return\n \n system_preference.edit(\n preferred_ooodoc_server_address=domain,\n diff --git a/bt5/erp5_promise/bt/revision b/bt5/erp5_promise/bt/revision index 2edeafb09db..b5045cc4046 100644 --- a/bt5/erp5_promise/bt/revision +++ b/bt5/erp5_promise/bt/revision @@ -1 +1 @@ -20 \ No newline at end of file +21 \ No newline at end of file -- 2.30.9