Author: jablko
Date: Wed Oct 27 20:53:45 2010
New Revision: 8597
Log:
Add missing relationTableMap funtions
Modified:
trunk/apps/qubit/modules/informationobject/templates/_event.php
trunk/js/dialog.js
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Modified: trunk/apps/qubit/modules/informationobject/templates/_event.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_event.php Wed Oct
27 20:35:16 2010 (r8596)
+++ trunk/apps/qubit/modules/informationobject/templates/_event.php Wed Oct
27 20:53:45 2010 (r8597)
@@ -82,8 +82,8 @@
// Define dialog
var dialog = new QubitDialog('updateEvent', {
'displayTable': 'relatedEvents',
- 'newRowTemplate': $rowTemplate,
- 'handleFieldRender': handleFieldRender });
+ 'handleFieldRender': handleFieldRender,
+ 'newRowTemplate': $rowTemplate });
$editButtonJs
} }
Modified: trunk/js/dialog.js
==============================================================================
--- trunk/js/dialog.js Wed Oct 27 20:35:16 2010 (r8596)
+++ trunk/js/dialog.js Wed Oct 27 20:53:45 2010 (r8597)
@@ -248,15 +248,13 @@
response =
thisDialog.options.relationTableMap.call(thisDialog, response);
}
- var dataMap = function (response)
+ return { results: [new (function (response)
{
for (name in response)
{
this[thisDialog.fieldPrefix + '[' + name + ']'] =
response[name];
}
- }
-
- return { results: [new dataMap(response)] };
+ })(response)] };
}
dataSource.sendRequest(null, {
Modified: trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
==============================================================================
--- trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Wed Oct 27 20:35:16 2010 (r8596)
+++ trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
Wed Oct 27 20:53:45 2010 (r8597)
@@ -100,8 +100,8 @@
// Define dialog
var dialog = new QubitDialog('resourceRelation', {
'displayTable': 'relatedEvents',
- 'newRowTemplate': $rowTemplate,
- 'handleFieldRender': handleFieldRender });
+ 'handleFieldRender': handleFieldRender,
+ 'newRowTemplate': $rowTemplate });
// Add edit button to rows
jQuery('#relatedEvents tr[id]', context)
Modified:
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Wed Oct 27 20:35:16 2010 (r8596)
+++
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
Wed Oct 27 20:53:45 2010 (r8597)
@@ -109,24 +109,21 @@
}
}
- // Map relation table data to dialog fields
- var relationTableMap = function (response)
- {
- response.resource = response.object;
- if ('$url' === response.resource)
- {
- response.resource = response.subject;
- }
-
- return response;
- }
-
// Define dialog
var dialog = new QubitDialog('actorRelation', {
'displayTable': 'relatedEntities',
- 'newRowTemplate': $rowTemplate,
'handleFieldRender': handleFieldRender,
- 'relationTableMap': relationTableMap });
+ 'newRowTemplate': $rowTemplate,
+ 'relationTableMap': function (response)
+ {
+ response.resource = response.object;
+ if ('$url' === response.resource)
+ {
+ response.resource = response.subject;
+ }
+
+ return response;
+ } });
// Add edit button to rows
jQuery('#relatedEntities tr[id]', context)
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Wed Oct 27 20:35:16 2010 (r8596)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
Wed Oct 27 20:53:45 2010 (r8597)
@@ -70,8 +70,14 @@
// Define dialog
var dialog = new QubitDialog('relatedEntity', {
'displayTable': 'relatedEntityDisplay',
+ 'handleFieldRender': handleFieldRender,
'newRowTemplate': $rowTemplate,
- 'handleFieldRender': handleFieldRender });
+ 'relationTableMap': function (response)
+ {
+ response.resource = response.object;
+
+ return response;
+ } });
// Add edit button to rows
jQuery('#relatedEntityDisplay tr[id]', context)
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Wed Oct 27 20:35:16 2010 (r8596)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
Wed Oct 27 20:53:45 2010 (r8597)
@@ -110,24 +110,21 @@
Drupal.behaviors.relatedFunction = {
attach: function (context)
{
- // Map relation table data to dialog fields
- var relationTableMap = function (response)
- {
- response.resource = response.object;
- if ('$url' === response.resource)
- {
- response.resource = response.subject;
- }
-
- return response;
- }
-
// Define dialog
var dialog = new QubitDialog('functionRelation', {
'displayTable': 'relatedFunctions',
'newRowTemplate': $rowTemplate,
'handleFieldRender': handleFieldRender,
- 'relationTableMap': relationTableMap });
+ 'relationTableMap': function (response)
+ {
+ response.resource = response.object;
+ if ('$url' === response.resource)
+ {
+ response.resource = response.subject;
+ }
+
+ return response;
+ } });
// Add edit button to rows
jQuery('#relatedFunctions tr[id]', context)
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Wed Oct 27 20:35:16 2010 (r8596)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
Wed Oct 27 20:53:45 2010 (r8597)
@@ -70,8 +70,14 @@
// Define dialog
var dialog = new QubitDialog('relatedResource', {
'displayTable': 'relatedResourceDisplay',
+ 'handleFieldRender': handleFieldRender,
'newRowTemplate': $rowTemplate,
- 'handleFieldRender': handleFieldRender });
+ 'relationTableMap': function (response)
+ {
+ response.resource = response.object;
+
+ return response;
+ } });
// Add edit button to rows
jQuery('#relatedResourceDisplay tr[id]', context)
--
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.
