Changeset 10980

Timestamp:

Mar 10, 2009, 6:01:01 PM (11 years ago)

Author:

ShogoKawahara

Message:

#3705:added ability to delete community image

Location:

OpenPNE3/trunk

Files:

• apps/pc_frontend/i18n/messages.ja.xml (modified) (1 diff)
• apps/pc_frontend/modules/default/templates/_formEditImage.php (added)
• lib/action/sfOpenPNECommunityAction.class.php (modified) (2 diffs)
• lib/form/CommunityConfigForm.class.php (modified) (3 diffs)
• lib/form/CommunityFileForm.class.php (modified) (3 diffs)

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

@@ -523 +523 @@
         <target>退会者データ</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Remove the current photo</source>
+        <target>この写真を削除する</target>
+      </trans-unit>
     </body>
   </file>

OpenPNE3/trunk/lib/action/sfOpenPNECommunityAction.class.php

@@ -53 +53 @@
 
     $this->community = CommunityPeer::retrieveByPk($this->id);
+    if (!$this->community)
+    {
+      $this->community = new Community();
+    }
+
 
     $this->communityForm       = new CommunityForm($this->community);
     $this->communityConfigForm = new CommunityConfigForm(array(), array('community' => $this->community));
-    $this->communityFileForm   = new CommunityFileForm();
+    $this->communityFileForm   = new CommunityFileForm(array(), array('community' => $this->community));
 
     if ($request->isMethod('post'))
@@ -67 +72 @@
       if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && $this->communityFileForm->isValid())
       {
-        $community = $this->communityForm->save();
-        $this->communityConfigForm->save($community);
-        $this->communityFileForm->save($community);
-        $this->redirect('community/home?id='.$community->getId());
+        $this->communityForm->save();
+        $this->communityConfigForm->save();
+        $this->communityFileForm->save();
+
+        $this->redirect('community/home?id='.$this->community->getId());
       }
     }

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

@@ -50 +50 @@
     if (!($community instanceof Community))
     {
-      if (!$this->community)
-      {
-        $community = new Community();
-      }
-      else
-      {
-        return;
-      }
+      $community = new Community();
     }
     $this->community = $community;
@@ -100 +93 @@
   }
 
-  public function save(Community $community)
+  public function save()
   {
     foreach ($this->getValues() as $key => $value)
@@ -108 +101 @@
       {
         $config = new CommunityConfig();
-        $config->setCommunity($community);
+        $config->setCommunity($this->community);
         $config->setName($key);
       }

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

@@ -19 +19 @@
 class CommunityFileForm extends sfForm
 {
+  protected
+    $community;
+
   public function __construct($defaults = array(), $options = array(), $CSRFSecret = null)
   {
@@ -26 +29 @@
   public function configure()
   {
-    $this->setWidget('file', new sfWidgetFormInputFile());
+    $this->setCommunity($this->getOption('community'));
+
+    $options = array(
+      'file_src'     => '',
+      'is_image'     => true,
+      'with_delete'  => true,
+      'delete_label' => sfContext::getInstance()->getI18N()->__('Remove the current photo')
+    );
+
+    if (!$this->community->isNew() && $this->community->getFileId())
+    {
+      sfContext::getInstance()->getConfiguration()->loadHelpers('Partial');
+      $options['edit_mode'] = true;
+      $options['template'] = get_partial('default/formEditImage', array('image' => $this->community));
+      $this->setValidator('file_delete', new sfValidatorBoolean(array('required' => false)));
+    }
+    else
+    {
+      $options['edit_mode'] = false;
+    }
+
+    $this->setWidget('file', new sfWidgetFormInputFileEditable($options, array('size' => 40)));
     $this->setValidator('file', new opValidatorImageFile(array('required' => false)));
 
@@ -34 +58 @@
   }
 
-  public function save(Community $community)
+  public function setCommunity($community)
   {
-    if (!$this->getValue('file'))
+    if (!($community instanceof Community))
     {
-      return false;
+      $community = new Community();
+    }
+    $this->community = $community;
+  }
+
+  public function save()
+  {
+    if ($this->getValue('file'))
+    {
+      if ($this->community->getFile())
+      {
+        $this->community->getFile()->delete(); 
+      }
+
+      $file = new File();
+      $file->setFromValidatedFile($this->getValue('file'));
+      $file->setName('c_'.$this->community->getId().'_'.$file->getName());
+
+      $this->community->setFile($file);
+    }
+    elseif ($this->getValue('file_delete'))
+    {
+      $this->community->getFile()->delete();
+      $this->community->setFile(null);
+    }
+    else
+    {
+      return;
     }
 
-    if ($community->getFile())
-    {
-      $community->getFile()->delete(); 
-    }
-
-    $file = new File();
-    $file->setFromValidatedFile($this->getValue('file'));
-    $file->setName('c_'.$community->getId().'_'.$file->getName());
-
-    $community->setFile($file);
-
-    $community->save();
+    $this->community->save();
   }
 }