Changeset 10582

Timestamp:

Jan 31, 2009, 9:30:31 PM (14 years ago)

Author:

ebihara

Message:

#3544:changed the execution filter catches opRuntimeException now

Location:

OpenPNE3/trunk

Files:

• apps/pc_frontend/i18n/messages.ja.xml (modified) (1 diff)
• apps/pc_frontend/modules/member/actions/actions.class.php (modified) (2 diffs)
• lib/exception/opRuntimeException.class.php (added)
• lib/filter/sfOpenPNEExecutionFilter.class.php (modified) (2 diffs)
• lib/form/MemberImageForm.class.php (modified) (1 diff)
• test/functional/pc_frontend/memberActionsTest.php (modified) (1 diff)

OpenPNE3/trunk/apps/pc_frontend/i18n/messages.ja.xml

@@ -463 +463 @@
         <target>メンバー登録</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Cannot add an image any more.</source>
+        <target>これ以上画像を追加できません。</target>
+      </trans-unit>
     </body>
   </file>

OpenPNE3/trunk/apps/pc_frontend/modules/member/actions/actions.class.php

@@ -98 +98 @@
   public function executeConfigImage($request)
   {
-    if ($request->isXmlHttpRequest())
-    {
-      $this->setLayout('plain');
-    }
-
     $options = array('member' => $this->getUser()->getMember());
     $this->form = new MemberImageForm(array(), $options);
@@ -108 +103 @@
     if ($request->isMethod('post'))
     {
-      $this->form->bindAndSave($request->getParameter('member_image'), $request->getFiles('member_image'));
-      $this->redirect('member/configImage');
+      try
+      {
+        $this->form->bindAndSave($request->getParameter('member_image'), $request->getFiles('member_image'));
+        $this->redirect('member/configImage');
+      }
+      catch (opRuntimeException $e)
+      {
+        $this->getUser()->setFlash('error', $e->getMessage());
+      }
     }
   }

OpenPNE3/trunk/lib/filter/sfOpenPNEExecutionFilter.class.php

@@ -30 +30 @@
     )));
 
-    $result = parent::handleAction($filterChain, $actionInstance);
+    try
+    {
+      $result = parent::handleAction($filterChain, $actionInstance);
+    }
+    catch (opRuntimeException $e)
+    {
+      $this->forwardToErrorAction();
+    }
 
     $dispatcher->notify(new sfEvent($this, 'op_action.post_execute_'.$moduleName.'_'.$actionName, array(
@@ -67 +74 @@
     }
   }
+
+  protected function forwardToErrorAction()
+  {
+    $this->context->getController()->forward('default', 'error');
+
+    throw new sfStopException();
+  }
 }

OpenPNE3/trunk/lib/form/MemberImageForm.class.php

@@ -41 +41 @@
     if ($count >= 3)
     {
-      throw new sfException('Cannot add an image any more.');
+      throw new opRuntimeException('Cannot add an image any more.');
     }
 

OpenPNE3/trunk/test/functional/pc_frontend/memberActionsTest.php

@@ -41 +41 @@
   )))
   ->isStatusCode(200)
+  ->with('response')->begin()
+  ->checkElement('#flashError td:contains("これ以上画像を追加できません。")', true)
+  ->end()
 ;