|
@@ -265,8 +265,8 @@ function materio_search_api_actuality(){
|
|
|
global $user;
|
|
|
|
|
|
if(!user_access('use materio search api')){
|
|
|
- $date = strtotime('-6 month');
|
|
|
- // dsm($date);
|
|
|
+ $date_limit = strtotime('-6 month');
|
|
|
+ // dsm(date('d m y', $date_limit));
|
|
|
}
|
|
|
|
|
|
$viewmode = isset($user->data['materiosearchapi_viewmode']) ? $user->data['materiosearchapi_viewmode'] : variable_get('defaultviewmode', 'full');
|
|
@@ -283,7 +283,7 @@ function materio_search_api_actuality(){
|
|
|
->range($offset,$limit);
|
|
|
|
|
|
if(!user_access('use materio search api')){
|
|
|
- $query->propertyCondition('created', $date, '>');
|
|
|
+ $query->propertyCondition('created', $date_limit, '>');
|
|
|
}
|
|
|
|
|
|
$result = $query->execute();
|
|
@@ -296,31 +296,33 @@ function materio_search_api_actuality(){
|
|
|
->entityCondition('bundle', array('breve'));
|
|
|
// dsm($count, 'count');
|
|
|
if(!user_access('use materio search api')){
|
|
|
- $count_query->propertyCondition('created', $date, '>');
|
|
|
+ $count_query->propertyCondition('created', $date_limit, '>');
|
|
|
}
|
|
|
$count = $count_query->count()->execute();
|
|
|
|
|
|
pager_default_initialize($count, $limit);
|
|
|
|
|
|
-
|
|
|
- foreach ($result['node'] as $nid => $n) {
|
|
|
- $breve = node_load($nid);
|
|
|
-
|
|
|
- if(!node_access('view', $breve))
|
|
|
- continue;
|
|
|
-
|
|
|
- $items[] = $breve;
|
|
|
- $materiaux = field_get_items('node',$breve,'field_materiau_ref');
|
|
|
- // dsm($materiaux, 'materiaux');
|
|
|
- if($materiaux){
|
|
|
- foreach ($materiaux as $value) {
|
|
|
- $materiau = node_load($value['target_id']);
|
|
|
- if(node_access('view', $materiau))
|
|
|
- $items[] = $materiau;
|
|
|
+ $items = array();
|
|
|
+ if(isset($result['node'])){
|
|
|
+ foreach ($result['node'] as $nid => $n) {
|
|
|
+ $breve = node_load($nid);
|
|
|
+
|
|
|
+ if(!node_access('view', $breve))
|
|
|
+ continue;
|
|
|
+
|
|
|
+ $items[] = $breve;
|
|
|
+ $materiaux = field_get_items('node',$breve,'field_materiau_ref');
|
|
|
+ // dsm($materiaux, 'materiaux');
|
|
|
+ if($materiaux){
|
|
|
+ foreach ($materiaux as $value) {
|
|
|
+ $materiau = node_load($value['target_id']);
|
|
|
+ if(node_access('view', $materiau))
|
|
|
+ $items[] = $materiau;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// drupal_set_title(t('Actualities'));
|
|
|
drupal_set_title(t(''));
|
|
|
|