[Isocial-svn] SF.net SVN: isocial:[296] app
Status: Pre-Alpha
Brought to you by:
aguidrevitch
From: <fsn...@us...> - 2008-08-26 11:14:47
|
Revision: 296 http://isocial.svn.sourceforge.net/isocial/?rev=296&view=rev Author: fsnobody Date: 2008-08-26 11:14:57 +0000 (Tue, 26 Aug 2008) Log Message: ----------- close ui for edit or delete system(default) album Modified Paths: -------------- app/controllers/blogapp/post_controller.php app/controllers/photoapp/album_controller.php app/views/photoapp/album/_edit_menu.tpl app/views/photoapp/album/index.tpl Modified: app/controllers/blogapp/post_controller.php =================================================================== --- app/controllers/blogapp/post_controller.php 2008-08-26 11:13:00 UTC (rev 295) +++ app/controllers/blogapp/post_controller.php 2008-08-26 11:14:57 UTC (rev 296) @@ -33,19 +33,15 @@ } // view function image_list () { -$script = "var tinyMCEImageList = new Array( - [\"Logo 1\", \"/home/eerunov/development/local/tmp/editor_javascript/tinymce/examples/logo.jpg\"], - [\"Logo 2 Over\", \"/home/eerunov/development/local/tmp/editor_javascript/tinymce/examples/logo_over.jpg\"] -);"; - $user_id = $this->current_user->getId(); if ($user_id) { + +// $photos = $this->PhotoappPhoto->find('all', array('conditions' => array('album_id = ' . $this->params['id']))); $file = new StoredFile(); $file->user_id = $this->current_user->getId(); $path = $file->path(); - //$this->debug($path); $imgs = array_diff(scandir(AK_PUBLIC_DIR . DS . $path), array('.', '..')); - //$this->debug($imgs); + if (count($imgs) > 0) { $script = "var tinyMCEImageList = new Array("; foreach ($imgs as $nn => $img_name) { Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-08-26 11:13:00 UTC (rev 295) +++ app/controllers/photoapp/album_controller.php 2008-08-26 11:14:57 UTC (rev 296) @@ -221,6 +221,9 @@ } } else if ($this->params['id']) { $this->album = $this->PhotoappAlbum->find($this->params['id']); + if ($this->album->is_default == 1) { + $this->redirectTo(array('action' => 'index')); // system album - not permited for edit + } return; } } @@ -232,8 +235,8 @@ if (!empty($this->params['album']) ){ // delete $album = $this->PhotoappAlbum->find($this->params['id']); - if ($album && $album->get('owner') == $this->current_user->getId() && $this->Request->isPost()) { - + + if ($album && $album->get('owner') == $this->current_user->getId() && $this->Request->isPost() && $album->is_default == 0) { $photos = $this->PhotoappPhoto->find('all', array('conditions' => array('album_id = ' . $this->params['id']))); if ($photos) { $this->PhotoappPhoto->destroyAll("album_id = " . $this->params['id']); // delete photos in album @@ -244,6 +247,8 @@ } else { $this->importErrors( $this->PhotoappAlbum->getErrors() ); } + } else { + $this->redirectTo(array('action' => 'index')); // can't be deleted } } else if (!empty($this->params['id']) && $this->PhotoappAlbum->find($this->params['id'])) { // pre delete Modified: app/views/photoapp/album/_edit_menu.tpl =================================================================== --- app/views/photoapp/album/_edit_menu.tpl 2008-08-26 11:13:00 UTC (rev 295) +++ app/views/photoapp/album/_edit_menu.tpl 2008-08-26 11:14:57 UTC (rev 296) @@ -4,8 +4,8 @@ <li class="first"><a href="/photoapp/album/add_photo/<?= $album->getId()?>" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add photos}</a></li><? ?><li class="first"><a href="/photoapp/album/view/<?= $album->getId()?>" class="<?= in_array($controller->getActionName(),array( 'edit_photo', 'view')) ? 'selected' : '' ?>">_{View}</a></li><? ?><li class="first"><a href="/photoapp/album/uploaded/<?= $album->getId()?>" class="<?= $controller->getActionName() == 'uploaded' ? 'selected' : '' ?>">_{Edit uploaded}</a></li><? - ?><li><a href="/photoapp/album/edit/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit info}</a></li><? - ?><li><a href="/photoapp/album/delete/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li> + ?><? if ($album->is_default == 0) {?><li><a href="/photoapp/album/edit/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit info}</a></li><?}?><? + ?><? if ($album->is_default == 0) {?><li><a href="/photoapp/album/delete/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li><?}?> </ul> </div> </div> Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-08-26 11:13:00 UTC (rev 295) +++ app/views/photoapp/album/index.tpl 2008-08-26 11:14:57 UTC (rev 296) @@ -40,7 +40,7 @@ <ul class="actions_list"> <li><a href="/photoapp/album/add_photo/<?= $my_album->getId()?>">_{Edit Album}</a></li> <li><a href="/photoapp/album/view/<?= $my_album->getId()?>">_{View Album}</a></li> - <li><a href="/photoapp/album/delete/<?= $my_album->getId()?>">_{Delete Album}</a></li> + <? if ($my_album->is_default == 0) {?><li><a href="/photoapp/album/delete/<?= $my_album->getId()?>">_{Delete Album}</a></li><?}?> </ul> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |