Skip to content

Port the location_cck module to allow for Location fields to be used. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anemirovsky wants to merge 1 commit into
base: 1.x-1.x
Choose a base branch
from
Open

Port the location_cck module to allow for Location fields to be used. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contrib/location_cck/location_cck.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ name = Location CCK
description = Defines a Location field type.
dependencies[] = location
package = Fields
core = 7.x
backdrop = 1.x
type = module
41 changes: 3 additions & 38 deletions contrib/location_cck/location_cck.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,8 @@
*/

/**
* Drupal 6 location_cck 3.x update.
* Implements hook_update_last_removed().
*/
function location_cck_update_6301() {
// Create a temporary table to fix some location_instance data.
$schema = drupal_get_schema('location_instance');
$schema['description'] = 'Temp table to repair data integrity of location_instance table.';
unset($schema['indexes']);
db_create_table('location_instance_tmp', $schema);

// Populate the temporary table.
$join_select = db_select('location_instance', 'li');
$join_select->addExpression("SUBSTRING_INDEX(genid, ':', -1)", 'genvid');
$join_select->fields('li', array('lid', 'genid'));

$insert_select = db_select('node', 'n')
->fields('n', array('nid', 'vid'))
->fields('l', array('genid', 'lid'));
$insert_select->join($join_select, 'l', 'n.vid = l.genvid');

db_insert('location_instance_tmp')
->fields(array('nid', 'vid', 'genid', 'lid'))
->from($insert_select)
->execute();

// Update the location_instance table.
db_delete('location_instance')
->condition('genid', 'cck:%', 'LIKE')
->execute();

$insert_select = db_select('location_instance_tmp', 'lit')
->fields('lit', array('nid', 'vid', 'genid', 'lid'));

db_insert('location_instance')
->fields(array('nid', 'vid', 'genid', 'lid'))
->from($insert_select)
->execute();

// Remove the temporary table.
db_drop_table('location_instance_tmp');
function location_cck_update_last_removed() {
return 6301;
}
4 changes: 2 additions & 2 deletions contrib/location_cck/location_cck.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ function location_cck_field_widget_form(&$form, &$form_state, $field, $instance,
if ($field['type'] == 'location') {
$settings = isset($field['settings']['location_settings']) ? $field['settings']['location_settings'] : array();
if (isset($form_state['values'])) {
$form_state_field_values = drupal_array_get_nested_value($form_state['values'], $element['#field_parents']);
$form_state_field_values = backdrop_array_get_nested_value($form_state['values'], $element['#field_parents']);
}

// Load location data for existing locations.
Expand Down Expand Up @@ -562,7 +562,7 @@ function theme_location_cck_field_map($variables) {
'#type' => 'gmap',
'#gmap_settings' => $map,
);
$content = drupal_render($location_map);
$content = backdrop_render($location_map);
}

return $content;
Expand Down