Skip to content

Commit ecd20c6

Browse files
committed
Changes from #LQY-916-12246
- Date order - Date from field, one year before. - Remove case_id field. New placeholder on search box.
1 parent 1b3f0d4 commit ecd20c6

File tree

1 file changed

+11
-33
lines changed

1 file changed

+11
-33
lines changed

os2web_cp_service.views_default.inc

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,6 @@ function os2web_cp_service_views_default_views() {
246246
$handler->display->display_options['sorts']['created']['field'] = 'created';
247247
$handler->display->display_options['sorts']['created']['order'] = 'DESC';
248248
$handler->display->display_options['filter_groups']['operator'] = 'OR';
249-
$handler->display->display_options['filter_groups']['groups'] = array(
250-
1 => 'AND',
251-
2 => 'AND',
252-
);
253249
/* Filterkriterie: Indhold: Udgivet */
254250
$handler->display->display_options['filters']['status']['id'] = 'status';
255251
$handler->display->display_options['filters']['status']['table'] = 'node';
@@ -284,8 +280,8 @@ return TRUE; // If no exposed inputs, remove all results
284280
$handler->display->display_options['filters']['combine']['group'] = 1;
285281
$handler->display->display_options['filters']['combine']['exposed'] = TRUE;
286282
$handler->display->display_options['filters']['combine']['expose']['operator_id'] = 'combine_op';
287-
$handler->display->display_options['filters']['combine']['expose']['label'] = 'Søgetekst';
288-
$handler->display->display_options['filters']['combine']['expose']['description'] = 'fx. Birkevej affald';
283+
$handler->display->display_options['filters']['combine']['expose']['label'] = 'Søgetekst eller sagsnummer';
284+
$handler->display->display_options['filters']['combine']['expose']['description'] = 'fx Birkevej. Affald. 12/99999';
289285
$handler->display->display_options['filters']['combine']['expose']['operator'] = 'combine_op';
290286
$handler->display->display_options['filters']['combine']['expose']['identifier'] = 'search-text';
291287
$handler->display->display_options['filters']['combine']['expose']['remember_roles'] = array(
@@ -328,7 +324,7 @@ return TRUE; // If no exposed inputs, remove all results
328324
5 => 0,
329325
);
330326
$handler->display->display_options['filters']['field_os2web_cp_service_date_value_1']['form_type'] = 'date_popup';
331-
$handler->display->display_options['filters']['field_os2web_cp_service_date_value_1']['default_date'] = '-3 month';
327+
$handler->display->display_options['filters']['field_os2web_cp_service_date_value_1']['default_date'] = '-1 year';
332328
/* Filterkriterie: os2web_cp_service_date_to */
333329
$handler->display->display_options['filters']['field_os2web_cp_service_date_value_2']['id'] = 'field_os2web_cp_service_date_value_2';
334330
$handler->display->display_options['filters']['field_os2web_cp_service_date_value_2']['table'] = 'field_data_field_os2web_cp_service_date';
@@ -352,22 +348,6 @@ return TRUE; // If no exposed inputs, remove all results
352348
);
353349
$handler->display->display_options['filters']['field_os2web_cp_service_date_value_2']['form_type'] = 'date_popup';
354350
$handler->display->display_options['filters']['field_os2web_cp_service_date_value_2']['default_date'] = 'now';
355-
/* Filterkriterie: Indhold: SagsID (field_os2web_cp_service_case_id) */
356-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['id'] = 'field_os2web_cp_service_case_id_value';
357-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['table'] = 'field_data_field_os2web_cp_service_case_id';
358-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['field'] = 'field_os2web_cp_service_case_id_value';
359-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['group'] = 1;
360-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['exposed'] = TRUE;
361-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['expose']['operator_id'] = 'field_os2web_cp_service_case_id_value_op';
362-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['expose']['label'] = 'Sagsnummer';
363-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['expose']['description'] = 'fx. 12/99999999';
364-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['expose']['operator'] = 'field_os2web_cp_service_case_id_value_op';
365-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['expose']['identifier'] = 'case_id';
366-
$handler->display->display_options['filters']['field_os2web_cp_service_case_id_value']['expose']['remember_roles'] = array(
367-
2 => '2',
368-
1 => 0,
369-
3 => 0,
370-
);
371351

372352
/* Display: Page */
373353
$handler = $view->new_display('page', 'Page', 'page');
@@ -410,12 +390,10 @@ return TRUE; // If no exposed inputs, remove all results
410390
t('[title]'),
411391
t('[field_os2web_cp_service_content]'),
412392
t('Dato'),
413-
t('Søgetekst'),
414-
t('fx. Birkevej affald'),
393+
t('Søgetekst eller sagsnummer'),
394+
t('fx Birkevej. Affald. 12/99999'),
415395
t('Fra'),
416396
t('Til'),
417-
t('Sagsnummer'),
418-
t('fx. 12/99999999'),
419397
t('Page'),
420398
t('Der kunne ikke findes nogle sager ud fra dine søgekriterier.'),
421399
t('Content pane'),
@@ -685,12 +663,12 @@ return TRUE; // If no exposed inputs, remove all results
685663
$handler->display->display_options['fields']['nothing']['alter']['text'] = '<div class="os2web_cp_service-ajax-loader ajax-loader" style="display:none;"></div>';
686664
$handler->display->display_options['fields']['nothing']['element_label_colon'] = FALSE;
687665
$handler->display->display_options['defaults']['sorts'] = FALSE;
688-
/* Sorteringskriterie: Indhold: Dokumentdato (field_os2web_cp_service_date) */
689-
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['id'] = 'field_os2web_cp_service_date_value';
690-
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['table'] = 'field_data_field_os2web_cp_service_date';
691-
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['field'] = 'field_os2web_cp_service_date_value';
692-
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['relationship'] = 'field_os2web_cp_service_doc_ref_target_id';
693-
$handler->display->display_options['sorts']['field_os2web_cp_service_date_value']['order'] = 'DESC';
666+
/* Sorteringskriterie: Indhold: Journalnummer (field_os2web_cp_service_doc_id) */
667+
$handler->display->display_options['sorts']['field_os2web_cp_service_doc_id_value']['id'] = 'field_os2web_cp_service_doc_id_value';
668+
$handler->display->display_options['sorts']['field_os2web_cp_service_doc_id_value']['table'] = 'field_data_field_os2web_cp_service_doc_id';
669+
$handler->display->display_options['sorts']['field_os2web_cp_service_doc_id_value']['field'] = 'field_os2web_cp_service_doc_id_value';
670+
$handler->display->display_options['sorts']['field_os2web_cp_service_doc_id_value']['relationship'] = 'field_os2web_cp_service_doc_ref_target_id';
671+
$handler->display->display_options['sorts']['field_os2web_cp_service_doc_id_value']['order'] = 'DESC';
694672
$handler->display->display_options['defaults']['arguments'] = FALSE;
695673
/* Kontekstuelt filter: Indhold: Nid */
696674
$handler->display->display_options['arguments']['nid']['id'] = 'nid';

0 commit comments

Comments
 (0)