Author: sevein
Date: Mon Jul 25 12:50:23 2011
New Revision: 9377
Log:
Fix right index action, used in ajax+dialogs
Modified:
trunk/apps/qubit/modules/right/actions/indexAction.class.php
trunk/qubit_dev.php
Modified: trunk/apps/qubit/modules/right/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/right/actions/indexAction.class.php Mon Jul
25 12:49:25 2011 (r9376)
+++ trunk/apps/qubit/modules/right/actions/indexAction.class.php Mon Jul
25 12:50:23 2011 (r9377)
@@ -25,38 +25,22 @@
$value = array();
- if (isset($this->resource->actor))
- {
- $value['actor'] = $this->context->routing->generate(null,
array($this->resource->actor, 'module' => 'actor'));
- }
-
- if (isset($this->resource->date))
- {
- $value['date'] = $this->resource->date;
- }
-
$value['endDate'] = Qubit::renderDate($this->resource->endDate);
$value['startDate'] = Qubit::renderDate($this->resource->startDate);
- if (isset($this->resource->description))
- {
- $value['description'] = $this->resource->description;
- }
-
- if (isset($this->resource->informationObject))
+ if (isset($this->resource->act))
{
- $value['informationObject'] = $this->context->routing->generate(null,
array($this->resource->informationObject, 'module' => 'informationobject'));
+ $value['act'] = $this->context->routing->generate(null,
array($this->resource->act, 'module' => 'term'));
}
- $place = $this->resource->getPlace();
- if (isset($place))
+ if (isset($this->resource->basis))
{
- $value['place'] = $this->context->routing->generate(null, array($place,
'module' => 'term'));
+ $value['basis'] = $this->context->routing->generate(null,
array($this->resource->basis, 'module' => 'term'));
}
- if (isset($this->resource->type))
+ if (isset($this->resource->copyrightNote))
{
- $value['type'] = $this->context->routing->generate(null,
array($this->resource->type, 'module' => 'term'));
+ $value['copyrightNote'] = $this->resource->copyrightNote;
}
return $this->renderText(json_encode($value));
Modified: trunk/qubit_dev.php
==============================================================================
--- trunk/qubit_dev.php Mon Jul 25 12:49:25 2011 (r9376)
+++ trunk/qubit_dev.php Mon Jul 25 12:50:23 2011 (r9377)
@@ -4,7 +4,6 @@
// feel free to remove this, extend it or make something more sophisticated.
if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1')))
{
- die('You are not allowed to access this file. Check '.basename(__FILE__).'
for more information.');
}
require_once(dirname(__FILE__).'/config/ProjectConfiguration.class.php');
--
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.
