Bug 109022

Description of problem:
When I go to the content-types tab and remove a content type, I expect
to be able to click on the "add a content type" link, select the type,
and then add it back to my section.  However, whenever I hit the "add"
button it actually cancells.  This is from the form have a
CancelListener that fires and the CancelListener forgets to check if
the cancel button was actually pressed.  The below patch will fix this
problem.

[randyg@graebner aplaws]$ diff -uw
cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java
cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane2.java
--- cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java	Tue
Nov  4 09:40:10 2003
+++ cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane2.java	Tue
Nov  4 09:39:58 2003
@@ -150,10 +150,12 @@
         public void submitted(FormSectionEvent event) 
             throws FormProcessException {
             PageState state = event.getPageState();
+            if (m_form.isCancelled(state)) {
             getBody().pop(state);
             throw new FormProcessException("cancelled");
         }
     }
+    }
 
     private void resetPane(PageState state) {
         getBody().reset(state);


Version-Release number of selected component (if applicable):
Nightly

How reproducible:
Always

Steps to Reproduce:
1.  try to add a content type
2.
3.
  
Actual results:
the content type should be added

Expected results:
The content type remains unmapped.

Additional info: