=== modified file 'services/services/views_service/views_service.inc' --- services/services/views_service/views_service.inc 2009-01-27 19:51:46 +0000 +++ services/services/views_service/views_service.inc 2009-02-09 13:05:19 +0000 @@ -12,19 +12,26 @@ * @param $view_name * String. The views name. * @param $display_id - * String (optional). + * String (optional). The display name. + * @param $fields + * Array (optional). A list of fields in the view. + * @param $offset + * Integer (optional). An offset integer for paging. + * @param $limit + * Integer (optional). A limit integer for paging. * @param $args * Array (optional). A list of params. * @return * Array. The views return. */ -function views_service_get($view_name, $fields = array(), $args = array(), $offset = 0, $limit = 0) { +function views_service_get($view_name, $display_id = 'default', $fields = array(), $args = array(), $offset = 0, $limit = 0) { $view = views_get_view($view_name); // Put all arguments and then execute $view->set_arguments($args, FALSE); $view->set_offset($offset); $view->set_items_per_page($limit); + $view->set_display($display_id); $view->execute(); return $view->result; @@ -35,17 +42,18 @@ * * @param view_name * String. The views name. + * @param $display_id + * String (optional). The display name. * @return * Boolean. TRUE if the user is allowed to load the given view. */ -function views_service_get_access($view_name) { - $view = views_get_view($view_name); - if (empty($view)) { +function views_service_get_access($view_name, $display_id = 'default') { + if ($view = views_get_view($view_name)) { + return $view->access($display_id); + } + else { return FALSE; } - - global $user; - return views_access($view); } /** === modified file 'services/services/views_service/views_service.module' --- services/services/views_service/views_service.module 2009-01-27 19:51:46 +0000 +++ services/services/views_service/views_service.module 2009-02-09 13:05:21 +0000 @@ -37,6 +37,12 @@ '#description' => t('View name.') ), array( + '#name' => 'display_id', + '#type' => 'string', + '#optional' => TRUE, + '#description' => t('A display provided by the selected view.') + ), + array( '#name' => 'fields', '#type' => 'array', '#optional' => TRUE,