Author: sevein
Date: Tue Sep 27 13:47:15 2011
New Revision: 9854
Log:
Revert r9851, different approach to avoid id conflicts between nodes and other
components in the app
Modified:
trunk/apps/qubit/modules/user/templates/editInformationObjectAclSuccess.php
trunk/lib/model/QubitMenu.php
Modified:
trunk/apps/qubit/modules/user/templates/editInformationObjectAclSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/user/templates/editInformationObjectAclSuccess.php
Tue Sep 27 13:03:29 2011 (r9853)
+++ trunk/apps/qubit/modules/user/templates/editInformationObjectAclSuccess.php
Tue Sep 27 13:47:15 2011 (r9854)
@@ -63,16 +63,16 @@
Drupal.behaviors.dialog = {
attach: function (context)
{
- Qubit.infoObjectDialog = new QubitAclDialog('addInformationObjectDialog',
'$tableTemplate', jQuery);
+ Qubit.infoObjectDialog = new QubitAclDialog('addInformationObject',
'$tableTemplate', jQuery);
}
}
EOL
) ?>
<!-- Add info object div - cut by aclDialog.js -->
- <div class="form-item" id="addInformationObjectDialog">
+ <div class="form-item" id="addInformationObject">
<label for="addInformationObject"><?php echo __('%1% name', array('%1%'
=> sfConfig::get('app_ui_label_informationobject'))) ?></label>
- <select name="addInformationObject" class="form-autocomplete"></select>
+ <select name="addInformationObject" id="addInformationObject"
class="form-autocomplete"></select>
<input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'informationobject', 'action' => 'autocomplete'))
?>"/>
</div>
@@ -99,16 +99,16 @@
Drupal.behaviors.dialog2 = {
attach: function (context)
{
- Qubit.repoDialog = new QubitAclDialog('addRepositoryDialog',
'$tableTemplate', jQuery);
+ Qubit.repoDialog = new QubitAclDialog('addRepository', '$tableTemplate',
jQuery);
}
}
EOL
) ?>
<!-- Add repository div - cut by aclDialog.js -->
- <div class="form-item" id="addRepositoryDialog">
+ <div class="form-item" id="addRepository">
<label for="addRepository"><?php echo __('%1% name', array('%1%' =>
sfConfig::get('app_ui_label_repository'))) ?></label>
- <select name="addRepository" class="form-autocomplete"></select>
+ <select name="addRepository" id="addRepository"
class="form-autocomplete"></select>
<input class="list" type="hidden" value="<?php echo
url_for(array('module' => 'repository', 'action' => 'autocomplete')) ?>"/>
</div>
Modified: trunk/lib/model/QubitMenu.php
==============================================================================
--- trunk/lib/model/QubitMenu.php Tue Sep 27 13:03:29 2011 (r9853)
+++ trunk/lib/model/QubitMenu.php Tue Sep 27 13:47:15 2011 (r9854)
@@ -518,7 +518,7 @@
$class = ' class="'.$class.'"';
}
- $id = isset($child->name) ? ' id="'.$child->name.'"' : '';
+ $id = isset($child->name) ? ' id="node_'.$child->name.'"' : '';
$li[] = '<li'.$class.$id.'>'.$a.'</li>';
}
--
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.
