Author: david
Date: Fri Oct 22 12:58:21 2010
New Revision: 8385
Log:
Separate processForm() and resource->save() actions. Delay status update until
after $resource->parent is set. Fixes issue #1823.
Modified:
trunk/apps/qubit/modules/actor/actions/editAction.class.php
trunk/apps/qubit/modules/default/actions/editAction.class.php
trunk/apps/qubit/modules/function/actions/editAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/apps/qubit/modules/repository/actions/editAction.class.php
Modified: trunk/apps/qubit/modules/actor/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/editAction.class.php Fri Oct 22
11:53:44 2010 (r8384)
+++ trunk/apps/qubit/modules/actor/actions/editAction.class.php Fri Oct 22
12:58:21 2010 (r8385)
@@ -163,6 +163,7 @@
if ($this->form->isValid())
{
$this->processForm();
+ $this->resource->save();
if (isset($request->id) && (0 < strlen($next =
$this->form->getValue('next'))))
{
Modified: trunk/apps/qubit/modules/default/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/default/actions/editAction.class.php Fri Oct
22 11:53:44 2010 (r8384)
+++ trunk/apps/qubit/modules/default/actions/editAction.class.php Fri Oct
22 12:58:21 2010 (r8385)
@@ -184,8 +184,6 @@
$this->processField($field);
}
}
-
- $this->resource->save();
}
public function execute($request)
Modified: trunk/apps/qubit/modules/function/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/editAction.class.php Fri Oct
22 11:53:44 2010 (r8384)
+++ trunk/apps/qubit/modules/function/actions/editAction.class.php Fri Oct
22 12:58:21 2010 (r8385)
@@ -59,6 +59,7 @@
if ($this->form->isValid())
{
$this->processForm();
+ $this->resource->save();
$this->redirect(array($this->resource, 'module' => 'function'));
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Oct 22 11:53:44 2010 (r8384)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Oct 22 12:58:21 2010 (r8385)
@@ -454,10 +454,12 @@
}
}
+ parent::processForm();
+
$this->updateStatus();
$this->updateChildLevels();
- parent::processForm();
+ $this->resource->save();
// Delete related objects marked for deletion
$this->deleteNotes();
Modified: trunk/apps/qubit/modules/repository/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/editAction.class.php Fri Oct
22 11:53:44 2010 (r8384)
+++ trunk/apps/qubit/modules/repository/actions/editAction.class.php Fri Oct
22 12:58:21 2010 (r8385)
@@ -220,6 +220,8 @@
{
parent::processForm();
+ $this->resource->save();
+
$this->updateContactInformation();
}
--
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.com/group/qubit-commits?hl=en.