LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MERGE] 

Konflikt, da die Korrektur des globalize-Aufrufes aus Zeile 247, die ich am Montag noch nicht commitet hatte, mittlerweile schon geändert wurde...

git-svn-id: https://svn.libreccm.org/ccm/trunk@3223 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2015-02-18 18:30:11 +00:00
parent 33a853a218
commit c5c18e7e0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java
View File

@ -51,7 +51,7 @@ public class ResourceTypeConfig {
private static final Logger s_log = Logger.getLogger private static final Logger s_log = Logger.getLogger
(ResourceTypeConfig.class); (ResourceTypeConfig.class);
/** /**s
* optionally set - prevents create/modify form being rendered unless user * optionally set - prevents create/modify form being rendered unless user
* has this privilege on the appropriate object (parent application in the * has this privilege on the appropriate object (parent application in the
* case of create, application in the case of modify * case of create, application in the case of modify
@ -243,7 +243,7 @@ public class ResourceTypeConfig {
PageState state = e.getPageState(); PageState state = e.getPageState();
if (m_buttons.getCancelButton().isSelected(state)) { if (m_buttons.getCancelButton().isSelected(state)) {
fireCompletionEvent(state); fireCompletionEvent(state)
throw new FormProcessException(KernelGlobalizationUtil.globalize( throw new FormProcessException(KernelGlobalizationUtil.globalize(
"kernel.cancelled")); "kernel.cancelled"));
} }