From: Bharat M. <bh...@us...> - 2005-01-09 08:21:53
|
Update of /cvsroot/gallery/gallery2/modules/thumbnail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6832/modules/thumbnail Modified Files: CustomThumbnailOption.inc module.inc Log Message: Added warning support to ItemEditOptions * Refactored the way that we register ItemEditOptions so that we register the class as an implementation of ItemEditOption and use the target view in the hint, instead. * added addError() and addWarning() to ItemAddPluginTestOption * ItemEditOptionTestCase::handleRequestAfterEdit() is now _handleRequestAfterEdit() * Added GalleryCoreApi::getAllFactoryImplementationIdsWithHint() (implemented in GalleryFactoryHelper_medium * ItemEdit.tpl now shows warnings from ItemEditOptions * Converted some instances of // to /* */ Index: module.inc =================================================================== RCS file: /cvsroot/gallery/gallery2/modules/thumbnail/module.inc,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- module.inc 27 Dec 2004 19:06:41 -0000 1.23 +++ module.inc 9 Jan 2005 08:21:44 -0000 1.24 @@ -61,9 +61,11 @@ 'ThumbnailToolkit', 'Thumbnail', $classDir . 'ThumbnailToolkit.class'); - GalleryCoreApi::registerFactoryImplementation('ItemEditItemOption', - 'CustomThumbnailOption', 'CustomThumbnailOption', - dirname(__FILE__) . '/CustomThumbnailOption.inc'); + GalleryCoreApi::registerFactoryImplementation('ItemEditOption', + 'CustomThumbnailOption', + 'CustomThumbnailOption', + dirname(__FILE__) . '/CustomThumbnailOption.inc', + array('ItemEditItem')); } /** Index: CustomThumbnailOption.inc =================================================================== RCS file: /cvsroot/gallery/gallery2/modules/thumbnail/CustomThumbnailOption.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CustomThumbnailOption.inc 15 Dec 2004 17:51:57 -0000 1.1 +++ CustomThumbnailOption.inc 9 Jan 2005 08:21:44 -0000 1.2 @@ -81,10 +81,11 @@ GalleryCoreApi::requireOnce(dirname(__FILE__) . '/classes/ThumbnailHelper.class'); $error = array(); + $warning = array('WARNING! foobar!'); if (!empty($form['tmp_name'][1])) { list ($ret, $lockId) = GalleryCoreApi::acquireReadLock(array($item->getId())); if ($ret->isError()) { - return array($ret->wrap(__FILE__, __LINE__), null); + return array($ret->wrap(__FILE__, __LINE__), null, null); } list ($ret, $thumbnailId) = ThumbnailHelper::addItem( @@ -93,40 +94,40 @@ $error[] = 'form[CustomThumbnailOption][error][imageMime]'; } else if ($ret->isError()) { GalleryCoreApi::releaseLocks($lockId); - return array($ret->wrap(__FILE__, __LINE__), null); + return array($ret->wrap(__FILE__, __LINE__), null, null); } if (empty($error)) { $ret = ThumbnailHelper::applyThumbnail($item, $thumbnailId); if ($ret->isError()) { GalleryCoreApi::releaseLocks($lockId); - return array($ret->wrap(__FILE__, __LINE__), null); + return array($ret->wrap(__FILE__, __LINE__), null, null); } } $ret = GalleryCoreApi::releaseLocks($lockId); if ($ret->isError()) { - return array($ret->wrap(__FILE__, __LINE__), null); + return array($ret->wrap(__FILE__, __LINE__), null, null); } } else if (isset($form['CustomThumbnailOption']['delete'])) { list ($ret, $thumbnailImage) = ThumbnailHelper::fetchThumbnail($item->getId()); if ($ret->isError()) { - return array($ret->wrap(__FILE__, __LINE__), null); + return array($ret->wrap(__FILE__, __LINE__), null, null); } if (!isset($thumbnailImage)) { - return array(GalleryStatus::error(ERROR_MISSING_OBJECT, __FILE__, __LINE__), null); + return array(GalleryStatus::error(ERROR_MISSING_OBJECT, __FILE__, __LINE__), null, null); } $ret = ThumbnailHelper::restoreThumbnail($item); if ($ret->isError()) { - return array($ret->wrap(__FILE__, __LINE__), null); + return array($ret->wrap(__FILE__, __LINE__), null, null); } $ret = GalleryCoreApi::deleteEntityById($thumbnailImage->getId()); if ($ret->isError()) { - return array($ret->wrap(__FILE__, __LINE__), null); + return array($ret->wrap(__FILE__, __LINE__), null, null); } } - return array(GalleryStatus::success(), $error); + return array(GalleryStatus::success(), $error, $warning); } } ?> |