appdb/include objectManager.php
WineHQ
wineowner at wine.codeweavers.com
Sun Aug 5 15:14:07 CDT 2007
ChangeSet ID: 31315
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner at winehq.org 2007/08/05 15:14:07
Modified files:
include : objectManager.php
Log message:
Chris Morgan <cmorgan at alum.wpi.edu>
Clean up error handling in processForm() to only check for errors when submitting an entry.
This enables the deletion or rejection of entries that produce errors. While we can't always
know why errors in objects make it this far we don't want to make it impossible to delete or
reject malformed entries.
Patch: http://cvs.winehq.org/patch.py?id=31315
Old revision New revision Changes Path
1.46 1.47 +21 -4 appdb/include/objectManager.php
Index: appdb/include/objectManager.php
diff -u -p appdb/include/objectManager.php:1.46 appdb/include/objectManager.php:1.47
--- appdb/include/objectManager.php:1.46 5 Aug 2007 20:14: 7 -0000
+++ appdb/include/objectManager.php 5 Aug 2007 20:14: 7 -0000
@@ -524,13 +524,20 @@ class ObjectManager
if(method_exists(new $this->sClass, "checkOutputEditorInput"))
{
$sErrors = $oObject->checkOutputEditorInput($aClean);
- if($sErrors)
- return $sErrors;
}
+ // NOTE: we only check for errors when submitting
+ // because there is always the possibility that we can
+ // get into some error state but we don't want to be stuck, unable
+ // to delete an entry because of an error that we don't want to
+ // have to correct
switch($aClean['sSubmit'])
{
case "Submit":
+ // if we have errors, return them
+ if($sErrors)
+ return $sErrors;
+
// if we have a valid iId then we are displaying an existing entry
// otherwise we should create the entry in the 'else' case
if($this->iId)
@@ -551,16 +558,24 @@ class ObjectManager
$oObject->create();
}
- break;
+ break;
case "Reject":
if(!$oObject->canEdit())
return FALSE;
$oObject->reject();
- break;
+ break;
+
case "Delete":
$this->delete_entry();
+ break;
+
+ default:
+ // shouldn't end up here, log the submit type that landed us here
+ error_log::log_error(ERROR_GENERAL, "processForm() received ".
+ "unknown aClean[sSubmit] of: ".$aClean['sSubmit']);
+ return false;
}
/* Displaying the entire un-queued list for a class is not a good idea,
@@ -762,7 +777,9 @@ class ObjectManager
echo "</font><br />";
return TRUE;
} else
+ {
return FALSE;
+ }
}
}
More information about the wine-cvs
mailing list