Skip to content

Bring module up to date with Drupal 7.x-3.29 #13

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
smaiorana wants to merge 5 commits into
base: 1.x
Choose a base branch
from
Open

Bring module up to date with Drupal 7.x-3.29 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6758b5
Issue #3276302 by Natallia Kazarynava, tyler.frankenstein: __clone me…
smaiorana Jan 5, 2024
333d4db
Issue #3052316 by solideogloria, tyler.frankenstein: JS behaviors mis…
smaiorana Jan 5, 2024
ee56dfb
Issue #3027807 by jacob.embree, tyler.frankenstein: Throw argument er…
smaiorana Jan 5, 2024
664993c
Issue #2944445 by GoZ: Resource version does not work with dash in re…
smaiorana Jan 5, 2024
2ada6ac
Issue #3277674 by shkiper, tyler.frankenstein, HitchShock: PHP8: depr…
smaiorana Jan 5, 2024
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
9 changes: 4 additions & 5 deletions js/services.admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
*/
Backdrop.behaviors.resourceMenuCollapse = {
attach: function (context, settings) {
var timeout = null,
arrowImageHTML = function(collapsed) {
var arrowImageHTML = function(collapsed) {
return settings.services.images[collapsed ? 'collapsed' : 'expanded'];
},
setRowsCollapsedState = function(toggle, $rows, collapsed) {
Expand All @@ -18,7 +17,7 @@
$(toggle).html(arrowImageHTML(collapsed));
};

$('td.resource-select-all').each(function() {
$('td.resource-select-all').once('resource-menu-collapse').each(function() {
var resourceName = this.id,
resource = settings.services.resources[this.id],
$rowElements = $('.' + resourceName + '-method'),
Expand All @@ -43,7 +42,7 @@
*/
Backdrop.behaviors.resourceSelectAll = {
attach: function (context, settings) {
$('td.resource-select-all').each(function () {
$('td.resource-select-all').once('resource-select-all').each(function () {
var resourceName = this.id,
methodCheckboxes = $('.' + resourceName + '-method .resource-method-select input[type=checkbox]'),
groupCheckbox = $('<input type="checkbox" class="form-checkbox" />').attr('id', this.id + '-select-all'),
Expand All @@ -70,4 +69,4 @@
});
}
};
})(jQuery);
})(jQuery);
3 changes: 3 additions & 0 deletions resources/comment_resource.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,9 @@ function _comment_resource_access($op = 'view', $args = array()) {
case 'edit':
return comment_access('edit', $comment);
case 'create':
if (!isset($comment->nid)) {
return services_error(t('Missing required argument nid'), 406);
}
// Check if the user may post comments, node has comments enabled
// and that the user has access to the node.
return user_access('post comments') && ($node->comment == COMMENT_NODE_OPEN);
Expand Down
10 changes: 6 additions & 4 deletions resources/taxonomy_resource.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,10 @@ function _taxonomy_resource_definition() {
*/
function _taxonomy_term_resource_retrieve($tid) {
$term = taxonomy_term_load($tid);
//Lets check field_permissions
$term = services_field_permissions_clean('view', 'taxonomy_term', $term);
return $term;
// Let's check field_permissions and return term object
return $term ?
services_field_permissions_clean('view', 'taxonomy_term', $term) :
services_error(t('Term @tid not found', array('@tid' => $tid)), 404);
}

/**
Expand Down Expand Up @@ -560,7 +561,8 @@ function taxonomy_service_get_by_machine_name($machine_name) {
* @return
* An array of node objects.
*/
function taxonomy_service_select_nodes($tid = '', $pager, $limit, $order) {
function taxonomy_service_select_nodes($tid, $pager, $limit, $order) {
$tid = $tid ? $tid : '';
$result = taxonomy_select_nodes($tid, (bool)$pager, $limit, $order);
foreach ($result as $nid) {
$node = node_load($nid);
Expand Down
9 changes: 5 additions & 4 deletions services.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,8 +896,9 @@ function services_request_apply_version(&$controller, $options = array()) {
return;
}
$updates = services_get_updates();
if (isset($method) && isset($updates[$resource][$method])) {
foreach ($updates[$resource][$method] as $update) {
$resource_clean_name = str_replace('-', '_', $resource);
if (isset($method) && isset($updates[$resource_clean_name][$method])) {
foreach ($updates[$resource_clean_name][$method] as $update) {
if (!isset($version)) {
$endpoint = services_get_server_info('endpoint', '');
$endpoint = services_endpoint_load($endpoint);
Expand Down Expand Up @@ -1186,7 +1187,7 @@ function services_load_endpoint_object($name = NULL) {

if (empty($schema) || !$cache_table_exists) {
return array();
}
}

// If fetching all we are finished.
if (!$name && $cache) {
Expand All @@ -1205,7 +1206,7 @@ function services_load_endpoint_object($name = NULL) {
$query->condition('name', array($name), 'IN');
}
$result = $query->execute();

// Unpack the results of the query onto objects and cache them.
foreach ($result as $data) {
$object = new stdClass;
Expand Down