[Isocial-svn] SF.net SVN: isocial: [217]

[<fsn...@us...>]

Revision: 217
          http://isocial.svn.sourceforge.net/isocial/?rev=217&view=rev
Author:   fsnobody
Date:     2008-05-23 09:24:56 -0700 (Fri, 23 May 2008)

Log Message:
-----------
is_cover for photos removed

Modified Paths:
--------------
    app/controllers/photoapp/album_controller.php
    app/installers/photoapp/album_installer.php
    app/models/photoapp_photo.php
    app/views/photoapp/album/edit_photo.tpl
    timesheet/eerunov.txt

Modified: app/controllers/photoapp/album_controller.php
===================================================================
--- app/controllers/photoapp/album_controller.php	2008-05-21 18:34:38 UTC (rev 216)
+++ app/controllers/photoapp/album_controller.php	2008-05-23 16:24:56 UTC (rev 217)
@@ -23,17 +23,20 @@
     
     function edit_photo () {
         if (!empty($this->params['photo']) && $this->params['photo']['action_edit'] == 'do_edit'){
+            
+            
             $photo = $this->PhotoappPhoto->findFirst(array('id' => $this->params['id']));
+            $photo_old = new PhotoappPhoto();
+            $photo_old->id = $photo->getId();
+            $photo_old->album_id = $this->params['photo_old']['album_id'];
+
+
             if ($photo) {
                 $album = $this->PhotoappAlbum->findFirst(array('id' => $photo->album_id));
                 if ($album->owner == $this->current_user->getId()) {
                     $photo->setAttributes($this->params['photo']);
+                    // check for old album. cases: 1 just update info, 2 moving to another album
                     if ($this->Request->isPost() && $photo->save()){
-                        if ($photo->is_cover == 1) {
-                            $album = $this->PhotoappAlbum->findFirst(array('id' => $photo->album_id));
-                            $album->img = $photo->img;
-                            $album->save();
-                        } // set cover if needed
                         $this->redirectTo(array('action' => 'view', 'id' => $album->id));
                     }
                 }
@@ -185,9 +188,7 @@
                     
                     $album = $this->PhotoappAlbum->find($this->params['id']);
                     if( empty($album->img)) {
-                        $photo->is_cover = 1;
                         $album->img = $photo->img;
-                        $photo->is_cover = 1;
                         $photo->save();
                     }
                     //$album->photos_count += 1;

Modified: app/installers/photoapp/album_installer.php
===================================================================
--- app/installers/photoapp/album_installer.php	2008-05-21 18:34:38 UTC (rev 216)
+++ app/installers/photoapp/album_installer.php	2008-05-23 16:24:56 UTC (rev 217)
@@ -23,7 +23,6 @@
             "CREATE TABLE `photoapp_photos` (
                 `id`                          int(11)      NOT NULL PRIMARY KEY AUTO_INCREMENT,
                 `album_id`                    int(11)      NOT NULL ,
-                `is_cover`                    int(1)       UNSIGNED NOT NULL DEFAULT '0',
                 `name`                        char(100)    NOT NULL DEFAULT '',
                 `caption`                     char(255)    NOT NULL DEFAULT '',
                 `created_at`                  datetime     NOT NULL ,

Modified: app/models/photoapp_photo.php
===================================================================
--- app/models/photoapp_photo.php	2008-05-21 18:34:38 UTC (rev 216)
+++ app/models/photoapp_photo.php	2008-05-23 16:24:56 UTC (rev 217)
@@ -12,11 +12,9 @@
     }*/
 
     function beforeDestroy() {
-
-        if ($this->is_cover) {
-            $this->album->load();
-            $this->album->img = "";
-            $this->album->save();
+        if ($album_cover = $this->album->findFirst("img = '" . $this->img . "'")) {
+            $album_cover->img = "";
+            $album_cover->save();
         }
 
         $path = str_replace("@" , "/", $this->img);

Modified: app/views/photoapp/album/edit_photo.tpl
===================================================================
--- app/views/photoapp/album/edit_photo.tpl	2008-05-21 18:34:38 UTC (rev 216)
+++ app/views/photoapp/album/edit_photo.tpl	2008-05-23 16:24:56 UTC (rev 217)
@@ -7,6 +7,7 @@
 <div class="uploaded_container">
     <?= $form_tag_helper->start_form_tag(array('action'=>'edit_photo', 'id' => $photo->getId())) ?>
     <?= $form_helper->hidden_field('photo', 'action_edit', array('value' => 'do_edit'))?>
+    <?= $form_helper->hidden_field('photo_old', 'album_id', array('value' => $photo->get('album_id')))?>
         <div class="edit_container">
 
             <div class="photo_comment">
@@ -27,12 +28,6 @@
                         </div>
                     </div><div class="clearfix"></div>
 
-                    <div class="form_create_row">
-                        <label >_{Cover}:</label>
-                        <div class="form_create_col">
-                            <?= $form_helper->check_box('photo', 'is_cover') ?>
-                        </div>
-                    </div><div class="clearfix"></div>
 
                     <div class="form_create_row">
                         <label >_{Move to}:</label>

Modified: timesheet/eerunov.txt
===================================================================
--- timesheet/eerunov.txt	2008-05-21 18:34:38 UTC (rev 216)
+++ timesheet/eerunov.txt	2008-05-23 16:24:56 UTC (rev 217)
@@ -15,3 +15,4 @@
 2008-05-15,10:00,11:00,photoapp,RT:2,"edit photo"
 2008-05-20,18:00,19:00,photoapp,RT:2,"edit photo - save cover to album,trouble in destroyPhoto when it is cover"
 2008-05-21,18:30,21:20,photoapp,RT:2,"cover + triggers for photos_count in album"
+2008-05-23,17:00,18:30,phoyoapp,RT:2,"remove is_cover in model"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.