Author: ornicar2
Date: 2010-01-21 15:48:23 +0100 (Thu, 21 Jan 2010)
New Revision: 26999
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/task/base/dmContextTask.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/config/doctrine/schema.yml
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/show/dmWidgetShowView.php
Log:
[Diem]
- fixed comment in dmBaseServiceContainer
- removed Timestampable behavior from dmUserPlugin associative models
- fixed possible warning on dmWidgetShowView
- added dmContext task methods for execution buffer output
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-01-21 13:44:16 UTC (rev 26998)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-01-21 14:48:23 UTC (rev 26999)
@@ -243,6 +243,7 @@
* with a set*Service() method, the former has always precedence.
*
* @param string $id The service identifier
+ * @param string $class Alternative class to use
*
* @return object The associated service
*
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/task/base/dmContextTask.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/task/base/dmContextTask.php
2010-01-21 13:44:16 UTC (rev 26998)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/task/base/dmContextTask.php
2010-01-21 14:48:23 UTC (rev 26999)
@@ -59,5 +59,56 @@
}
}
}
+
+ protected function exec($command)
+ {
+ if(!$this->context->get('filesystem')->exec($command, array($this,
'logOutput'), array($this, 'logErrors')))
+ {
+ throw new dmException(implode(', ',
$this->context->get('filesystem')->getLastExec()));
+ }
+ }
+
+ public function logOutput($output)
+ {
+ if (false !== $pos = strpos($output, "\n"))
+ {
+ $this->outputBuffer .= substr($output, 0, $pos);
+ $this->log($this->outputBuffer);
+ $this->outputBuffer = substr($output, $pos + 1);
+ }
+ else
+ {
+ $this->outputBuffer .= $output;
+ }
+ }
+
+ public function logErrors($output)
+ {
+ if (false !== $pos = strpos($output, "\n"))
+ {
+ $this->errorBuffer .= substr($output, 0, $pos);
+ $this->log($this->formatter->format($this->errorBuffer, 'ERROR'));
+ $this->errorBuffer = substr($output, $pos + 1);
+ }
+ else
+ {
+ $this->errorBuffer .= $output;
+ }
+ }
+
+ protected function clearBuffers()
+ {
+ if ($this->outputBuffer)
+ {
+ $this->log($this->outputBuffer);
+ $this->outputBuffer = '';
+ }
+
+ if ($this->errorBuffer)
+ {
+ $this->log($this->formatter->format($this->errorBuffer, 'ERROR'));
+ $this->errorBuffer = '';
+ }
+ }
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/config/doctrine/schema.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/config/doctrine/schema.yml
2010-01-21 13:44:16 UTC (rev 26998)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/config/doctrine/schema.yml
2010-01-21 14:48:23 UTC (rev 26999)
@@ -74,7 +74,6 @@
symfony:
form: false
filter: false
- actAs: [Timestampable]
columns:
dm_group_id:
type: integer
@@ -97,7 +96,6 @@
symfony:
form: false
filter: false
- actAs: [Timestampable]
columns:
dm_user_id:
type: integer
@@ -120,7 +118,6 @@
symfony:
form: false
filter: false
- actAs: [Timestampable]
columns:
dm_user_id:
type: integer
@@ -143,7 +140,6 @@
symfony:
form: false
filter: false
- actAs: [Timestampable]
columns:
dm_user_id:
type: integer
Modified:
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/show/dmWidgetShowView.php
===================================================================
---
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/show/dmWidgetShowView.php
2010-01-21 13:44:16 UTC (rev 26998)
+++
plugins/diemPlugin/trunk/dmFrontPlugin/lib/dmWidget/show/dmWidgetShowView.php
2010-01-21 14:48:23 UTC (rev 26999)
@@ -22,7 +22,7 @@
{
$query = $this->dmModule->getTable()->createQuery('r');
- if ($this->compiledVars['recordId'])
+ if (!empty($this->compiledVars['recordId']))
{
$query->addWhere('r.id = ?', $this->compiledVars['recordId']);
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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/symfony-svn?hl=en.
