From c5c18e7e0abe5ec45de3f22ae54243e292605a05 Mon Sep 17 00:00:00 2001 From: tosmers Date: Wed, 18 Feb 2015 18:30:11 +0000 Subject: [PATCH] =?UTF-8?q?[MERGE]=20Konflikt,=20da=20die=20Korrektur=20de?= =?UTF-8?q?s=20globalize-Aufrufes=20aus=20Zeile=20247,=20die=20ich=20am=20?= =?UTF-8?q?Montag=20noch=20nicht=20commitet=20hatte,=20mittlerweile=20scho?= =?UTF-8?q?n=20ge=C3=A4ndert=20wurde...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3223 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java b/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java index c1bf457df..3232b44c9 100755 --- a/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java +++ b/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java @@ -51,7 +51,7 @@ public class ResourceTypeConfig { private static final Logger s_log = Logger.getLogger (ResourceTypeConfig.class); - /** + /**s * optionally set - prevents create/modify form being rendered unless user * has this privilege on the appropriate object (parent application in the * case of create, application in the case of modify @@ -243,7 +243,7 @@ public class ResourceTypeConfig { PageState state = e.getPageState(); if (m_buttons.getCancelButton().isSelected(state)) { - fireCompletionEvent(state); + fireCompletionEvent(state) throw new FormProcessException(KernelGlobalizationUtil.globalize( "kernel.cancelled")); }