Author: jablko
Date: Fri Sep 18 10:55:50 2009
New Revision: 3406
Log:
Cosmetic change, instantiate sfForm on first line of ->execute()
Modified:
trunk/apps/qubit/modules/actor/actions/deleteAction.class.php
trunk/apps/qubit/modules/actor/actions/editAction.class.php
trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php
trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editPhysicalObjectsAction.class.php
trunk/apps/qubit/modules/repository/actions/deleteAction.class.php
trunk/apps/qubit/modules/repository/actions/editAction.class.php
trunk/apps/qubit/modules/user/actions/editAction.class.php
Modified: trunk/apps/qubit/modules/actor/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/deleteAction.class.php Fri Sep
18 10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/actor/actions/deleteAction.class.php Fri Sep
18 10:55:50 2009 (r3406)
@@ -21,6 +21,8 @@
{
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->actor = QubitActor::getById($request->id);
if (!isset($this->actor))
@@ -28,8 +30,6 @@
$this->forward404();
}
- $this->form = new sfForm;
-
if ($request->isMethod('delete'))
{
foreach ($this->actor->events as $event)
Modified: trunk/apps/qubit/modules/actor/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/editAction.class.php Fri Sep 18
10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/actor/actions/editAction.class.php Fri Sep 18
10:55:50 2009 (r3406)
@@ -31,6 +31,8 @@
{
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->actor = new QubitActor;
if (isset($request->id))
@@ -41,8 +43,6 @@
}
}
- $this->form = new sfForm;
-
// Always add optimistic lock
$this->form->setDefault('serialNumber', $this->actor->serialNumber);
$this->form->setValidator('serialNumber', new sfValidatorInteger);
Modified: trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php Fri Sep
18 10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php Fri Sep
18 10:55:50 2009 (r3406)
@@ -29,6 +29,8 @@
{
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->digitalObject = new QubitDigitalObject;
$this->informationObject = new QubitInformationObject;
@@ -55,8 +57,6 @@
}
}
- $this->form = new sfForm;
-
$this->form->setValidator('file', new sfValidatorFile);
$this->form->setWidget('file', new sfWidgetFormInputFile);
Modified:
trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
Fri Sep 18 10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/informationobject/actions/deleteAction.class.php
Fri Sep 18 10:55:50 2009 (r3406)
@@ -21,6 +21,8 @@
{
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->informationObject = QubitInformationObject::getById($request->id);
// Check that object exists and that it is not the root
@@ -31,8 +33,6 @@
$request->setAttribute('informationObject', $this->informationObject);
- $this->form = new sfForm;
-
if ($request->isMethod('delete'))
{
foreach
($this->informationObject->descendants->andSelf()->orderBy('rgt') as
$descendant)
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Sep 18 10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Sep 18 10:55:50 2009 (r3406)
@@ -158,6 +158,9 @@
public function execute($request)
{
+ $this->form = new sfForm;
+ $this->form->getValidatorSchema()->setOption('allow_extra_fields', true);
+
$this->informationObject = new QubitInformationObject;
if (isset($request->id))
@@ -171,9 +174,6 @@
}
}
- $this->form = new sfForm;
- $this->form->getValidatorSchema()->setOption('allow_extra_fields', true);
-
// Always add optimistic lock
$this->form->setDefault('serialNumber',
$this->informationObject->serialNumber);
$this->form->setValidator('serialNumber', new sfValidatorInteger);
Modified:
trunk/apps/qubit/modules/informationobject/actions/editPhysicalObjectsAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/editPhysicalObjectsAction.class.php
Fri Sep 18 10:32:28 2009 (r3405)
+++
trunk/apps/qubit/modules/informationobject/actions/editPhysicalObjectsAction.class.php
Fri Sep 18 10:55:50 2009 (r3406)
@@ -29,6 +29,8 @@
{
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->informationObject = QubitInformationObject::getById($request->id);
// Check that object exists and that it is not the root
@@ -39,8 +41,6 @@
$request->setAttribute('informationObject', $this->informationObject);
- $this->form = new sfForm;
-
$this->relations =
QubitRelation::getRelationsByObjectId($this->informationObject->getId(),
array('typeId'=>QubitTerm::HAS_PHYSICAL_OBJECT_ID));
if ($request->isMethod('post'))
Modified: trunk/apps/qubit/modules/repository/actions/deleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/deleteAction.class.php Fri Sep
18 10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/repository/actions/deleteAction.class.php Fri Sep
18 10:55:50 2009 (r3406)
@@ -21,6 +21,8 @@
{
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->repository = QubitRepository::getById($request->id);
if (!isset($this->repository))
@@ -28,8 +30,6 @@
$this->forward404();
}
- $this->form = new sfForm;
-
if ($request->isMethod('delete'))
{
foreach ($this->repository->informationObjects as $informationObject)
Modified: trunk/apps/qubit/modules/repository/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/editAction.class.php Fri Sep
18 10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/repository/actions/editAction.class.php Fri Sep
18 10:55:50 2009 (r3406)
@@ -31,6 +31,8 @@
{
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->repository = new QubitRepository;
if (isset($request->id))
@@ -41,8 +43,6 @@
}
}
- $this->form = new sfForm;
-
// Always add optimistic lock
$this->form->setDefault('serialNumber', $this->repository->serialNumber);
$this->form->setValidator('serialNumber', new sfValidatorInteger);
Modified: trunk/apps/qubit/modules/user/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/editAction.class.php Fri Sep 18
10:32:28 2009 (r3405)
+++ trunk/apps/qubit/modules/user/actions/editAction.class.php Fri Sep 18
10:55:50 2009 (r3406)
@@ -74,6 +74,8 @@
public function execute($request)
{
+ $this->form = new sfForm;
+
$this->user = new QubitUser;
if (isset($this->request->id))
@@ -86,7 +88,6 @@
}
}
- $this->form = new sfForm;
$this->form->getValidatorSchema()->setOption('allow_extra_fields', true);
$this->form->getValidatorSchema()->setPostValidator(new
sfValidatorSchemaCompare(
'password', '==', 'confirmPassword',
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
