Skip to content
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

Add Support for Unlimited Value Fields #824

Closed
wants to merge 2 commits into from
Closed

Add Support for Unlimited Value Fields #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2885d4
Add Support for Unlimited Value Fields
luxio Jul 15, 2016
c46a15b
Update binaries.
luxio Jul 15, 2016
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
74 changes: 50 additions & 24 deletions bin/drupalgap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! drupalgap 2016-06-28 */
/*! drupalgap 2016-07-15 */
// Initialize the drupalgap json object.
var drupalgap = drupalgap || drupalgap_init(); // Do not remove this line.

Expand Down Expand Up @@ -2859,23 +2859,6 @@ function _drupalgap_form_render_element(form, element) {
// Are we skipping the render of the item?
if (!render_item) { return ''; }

// Show the 'Add another item' button on unlimited value fields.
/*if (element.field_info_field &&
element.field_info_field.cardinality == -1) {
var add_another_item_variables = {
text: 'Add another item',
attributes: {
'class': 'drupalgap_form_add_another_item',
onclick:
"javascript:_drupalgap_form_add_another_item('" +
form.id + "', '" +
element.name + "', " +
delta +
')'
}
};
html += theme('button', add_another_item_variables);
}*/

// Is this element wrapped? We won't wrap hidden inputs by default, unless
// someone is overriding it.
Expand Down Expand Up @@ -2924,6 +2907,26 @@ function _drupalgap_form_render_element(form, element) {
html += '<div class="description">' + t(element.description) + '</div>';
}

// Show the 'Add another item' button on unlimited value fields.
if (element.field_info_field &&
element.field_info_field.cardinality == -1) {
var add_another_item_variables = {
text: 'Add another item',
attributes: {
'class': 'drupalgap_form_add_another_item',
onclick:
"javascript:_drupalgap_form_add_another_item('" +
form.id + "', '" +
element.name + "', " +
delta +
')'
}
};
html += theme('button', add_another_item_variables);
console.log('class + : ' + drupalgap_form_get_element_container_class(name));
}


// Close the element container.
if (wrapped) { html += '</div>'; }

Expand Down Expand Up @@ -3125,8 +3128,8 @@ function _drupalgap_form_add_another_item(form_id, name, delta) {
// Locate the last item, load the form, extract the element from
// the form, generate default variables for the new item, determine the next
// delta value.
var selector = '.' + drupalgap_form_get_element_container_class(name) +
' .drupalgap_form_add_another_item';
var selector = '.' + drupalgap_form_get_element_container_class(name).replace(/\s+/g, '.') + ' .drupalgap_form_add_another_item';
console.log('selector: ' + selector);
var add_another_item_button = $(selector);
var form = drupalgap_form_local_storage_load(form_id);
var language = language_default();
Expand All @@ -3139,7 +3142,10 @@ function _drupalgap_form_add_another_item(form_id, name, delta) {
form.elements[name][language][delta + 1] = item;
var element = form.elements[name];
var variables = {
attributes: {},
attributes: {
id: item.id,
value: ''
},
field_info_field: element.field_info_field,
field_info_instance: element.field_info_instance
};
Expand All @@ -3157,8 +3163,19 @@ function _drupalgap_form_add_another_item(form_id, name, delta) {
);
drupalgap_form_local_storage_save(form);
$(add_another_item_button).before(
_drupalgap_form_render_element_item(form, element, variables, item)
_drupalgap_form_render_element_item(form, element, variables, item)
);
// increment delta of the add another button item
$(add_another_item_button).attr("onclick",
"javascript:_drupalgap_form_add_another_item('" +
form.id + "', '" +
element.name + "', " +
(delta + 1) +
")"
);
// enhance the markup of dynamically added element
$('#' + drupalgap_get_page_id()).trigger('create');

}
catch (error) { console.log('_drupalgap_form_add_another_item - ' + error); }
}
Expand Down Expand Up @@ -3745,7 +3762,8 @@ function drupalgap_form_state_values_assemble(form) {
form_state.values[name][lng] = {};
var allowed_values = element.field_info_field.cardinality;
if (allowed_values == -1) {
allowed_values = 1; // Convert unlimited value field to one for now...
// how many values are in the form
allowed_values = Object.keys(element[lng]).length;
}
for (var delta = 0; delta < allowed_values; delta++) {
id = drupalgap_form_get_element_id(name, form.id, lng, delta);
Expand Down Expand Up @@ -8498,7 +8516,15 @@ function drupalgap_entity_build_from_form_state(form, form_state) {
var allowed_values = form.elements[name].field_info_field.cardinality;

// Convert unlimited value fields to one, for now...
if (allowed_values == -1) { allowed_values = 1; }
// if (allowed_values == -1) { allowed_values = 1; }
if (allowed_values == -1) {
console.log('drupalgap_entity_build_from_form_state - value: ');
console.log(value);
allowed_values = Object.keys(value[language]).length;
console.log('allowed_values : '+ allowed_values);
}



// Make sure there is at least one value before creating the form
// element on the entity.
Expand Down
14 changes: 7 additions & 7 deletions bin/drupalgap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions src/includes/form.elements.inc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,23 +380,6 @@ function _drupalgap_form_render_element(form, element) {
// Are we skipping the render of the item?
if (!render_item) { return ''; }

// Show the 'Add another item' button on unlimited value fields.
/*if (element.field_info_field &&
element.field_info_field.cardinality == -1) {
var add_another_item_variables = {
text: 'Add another item',
attributes: {
'class': 'drupalgap_form_add_another_item',
onclick:
"javascript:_drupalgap_form_add_another_item('" +
form.id + "', '" +
element.name + "', " +
delta +
')'
}
};
html += theme('button', add_another_item_variables);
}*/

// Is this element wrapped? We won't wrap hidden inputs by default, unless
// someone is overriding it.
Expand Down Expand Up @@ -445,6 +428,26 @@ function _drupalgap_form_render_element(form, element) {
html += '<div class="description">' + t(element.description) + '</div>';
}

// Show the 'Add another item' button on unlimited value fields.
if (element.field_info_field &&
element.field_info_field.cardinality == -1) {
var add_another_item_variables = {
text: 'Add another item',
attributes: {
'class': 'drupalgap_form_add_another_item',
onclick:
"javascript:_drupalgap_form_add_another_item('" +
form.id + "', '" +
element.name + "', " +
delta +
')'
}
};
html += theme('button', add_another_item_variables);
console.log('class + : ' + drupalgap_form_get_element_container_class(name));
}


// Close the element container.
if (wrapped) { html += '</div>'; }

Expand Down
22 changes: 18 additions & 4 deletions src/includes/form.inc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ function _drupalgap_form_add_another_item(form_id, name, delta) {
// Locate the last item, load the form, extract the element from
// the form, generate default variables for the new item, determine the next
// delta value.
var selector = '.' + drupalgap_form_get_element_container_class(name) +
' .drupalgap_form_add_another_item';
var selector = '.' + drupalgap_form_get_element_container_class(name).replace(/\s+/g, '.') + ' .drupalgap_form_add_another_item';
console.log('selector: ' + selector);
var add_another_item_button = $(selector);
var form = drupalgap_form_local_storage_load(form_id);
var language = language_default();
Expand All @@ -24,7 +24,10 @@ function _drupalgap_form_add_another_item(form_id, name, delta) {
form.elements[name][language][delta + 1] = item;
var element = form.elements[name];
var variables = {
attributes: {},
attributes: {
id: item.id,
value: ''
},
field_info_field: element.field_info_field,
field_info_instance: element.field_info_instance
};
Expand All @@ -42,8 +45,19 @@ function _drupalgap_form_add_another_item(form_id, name, delta) {
);
drupalgap_form_local_storage_save(form);
$(add_another_item_button).before(
_drupalgap_form_render_element_item(form, element, variables, item)
_drupalgap_form_render_element_item(form, element, variables, item)
);
// increment delta of the add another button item
$(add_another_item_button).attr("onclick",
"javascript:_drupalgap_form_add_another_item('" +
form.id + "', '" +
element.name + "', " +
(delta + 1) +
")"
);
// enhance the markup of dynamically added element
$('#' + drupalgap_get_page_id()).trigger('create');

}
catch (error) { console.log('_drupalgap_form_add_another_item - ' + error); }
}
Expand Down
3 changes: 2 additions & 1 deletion src/includes/form.submission.inc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ function drupalgap_form_state_values_assemble(form) {
form_state.values[name][lng] = {};
var allowed_values = element.field_info_field.cardinality;
if (allowed_values == -1) {
allowed_values = 1; // Convert unlimited value field to one for now...
// how many values are in the form
allowed_values = Object.keys(element[lng]).length;
}
for (var delta = 0; delta < allowed_values; delta++) {
id = drupalgap_form_get_element_id(name, form.id, lng, delta);
Expand Down
10 changes: 9 additions & 1 deletion src/modules/entity/entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,15 @@ function drupalgap_entity_build_from_form_state(form, form_state) {
var allowed_values = form.elements[name].field_info_field.cardinality;

// Convert unlimited value fields to one, for now...
if (allowed_values == -1) { allowed_values = 1; }
// if (allowed_values == -1) { allowed_values = 1; }
if (allowed_values == -1) {
console.log('drupalgap_entity_build_from_form_state - value: ');
console.log(value);
allowed_values = Object.keys(value[language]).length;
console.log('allowed_values : '+ allowed_values);
}



// Make sure there is at least one value before creating the form
// element on the entity.
Expand Down