Skip to content

Commit 6a2f753

Browse files
andersbryrupandersbryrup
committed
Merge branch 'develop'
2 parents e2c7e55 + 0585a01 commit 6a2f753

File tree

2 files changed

+52
-12
lines changed

2 files changed

+52
-12
lines changed

‎os2web_cp_service.pages_default.inc

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,36 @@ function os2web_cp_service_default_page_manager_handlers() {
5454
),
5555
);
5656
$display->cache = array();
57-
$display->title = '%node:title';
57+
$display->title = '';
5858
$display->content = array();
5959
$display->panels = array();
6060
$pane = new stdClass();
6161
$pane->pid = 'new-1';
6262
$pane->panel = 'center';
63+
$pane->type = 'custom';
64+
$pane->subtype = 'custom';
65+
$pane->shown = TRUE;
66+
$pane->access = array();
67+
$pane->configuration = array(
68+
'admin_title' => 'Gå tilbage',
69+
'title' => '',
70+
'body' => '<a href="javascript:history.go(-1)">Gå tilbage til søgning</a>',
71+
'format' => 'full_html',
72+
'substitute' => 1,
73+
);
74+
$pane->cache = array();
75+
$pane->style = array(
76+
'settings' => NULL,
77+
);
78+
$pane->css = array();
79+
$pane->extras = array();
80+
$pane->position = 0;
81+
$pane->locks = array();
82+
$display->content['new-1'] = $pane;
83+
$display->panels['center'][0] = 'new-1';
84+
$pane = new stdClass();
85+
$pane->pid = 'new-2';
86+
$pane->panel = 'center';
6387
$pane->type = 'views';
6488
$pane->subtype = 'os2web_cp_service_cp_case_view';
6589
$pane->shown = TRUE;
@@ -89,10 +113,10 @@ function os2web_cp_service_default_page_manager_handlers() {
89113
);
90114
$pane->css = array();
91115
$pane->extras = array();
92-
$pane->position = 0;
116+
$pane->position = 1;
93117
$pane->locks = array();
94-
$display->content['new-1'] = $pane;
95-
$display->panels['center'][0] = 'new-1';
118+
$display->content['new-2'] = $pane;
119+
$display->panels['center'][1] = 'new-2';
96120
$display->hide_title = PANELS_TITLE_FIXED;
97121
$display->title_pane = '0';
98122
$handler->conf['display'] = $display;
@@ -146,7 +170,7 @@ function os2web_cp_service_default_page_manager_handlers() {
146170
$display->content = array();
147171
$display->panels = array();
148172
$pane = new stdClass();
149-
$pane->pid = 'new-2';
173+
$pane->pid = 'new-3';
150174
$pane->panel = 'center';
151175
$pane->type = 'views';
152176
$pane->subtype = 'os2web_cp_service_cp_document_view';
@@ -179,8 +203,8 @@ function os2web_cp_service_default_page_manager_handlers() {
179203
$pane->extras = array();
180204
$pane->position = 0;
181205
$pane->locks = array();
182-
$display->content['new-2'] = $pane;
183-
$display->panels['center'][0] = 'new-2';
206+
$display->content['new-3'] = $pane;
207+
$display->panels['center'][0] = 'new-3';
184208
$display->hide_title = PANELS_TITLE_FIXED;
185209
$display->title_pane = '0';
186210
$handler->conf['display'] = $display;

‎os2web_cp_service.views_default.inc

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ function os2web_cp_service_views_default_views() {
2424
$handler = $view->new_display('default', 'Master', 'default');
2525
$handler->display->display_options['use_more_always'] = FALSE;
2626
$handler->display->display_options['use_more_text'] = 'mere';
27+
$handler->display->display_options['group_by'] = TRUE;
2728
$handler->display->display_options['access']['type'] = 'perm';
2829
$handler->display->display_options['cache']['type'] = 'none';
2930
$handler->display->display_options['query']['type'] = 'views_query';
31+
$handler->display->display_options['query']['options']['distinct'] = TRUE;
3032
$handler->display->display_options['exposed_form']['type'] = 'basic';
3133
$handler->display->display_options['exposed_form']['options']['submit_button'] = 'Filtrer';
3234
$handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Gendan';
@@ -115,10 +117,16 @@ function os2web_cp_service_views_default_views() {
115117
'empty_column' => 0,
116118
),
117119
);
118-
/* Opførsel ved ingen resultater: Global: Unfiltered text */
119-
$handler->display->display_options['empty']['area_text_custom']['id'] = 'area_text_custom';
120-
$handler->display->display_options['empty']['area_text_custom']['table'] = 'views';
121-
$handler->display->display_options['empty']['area_text_custom']['field'] = 'area_text_custom';
120+
/* Opførsel ved ingen resultater: Global: PHP */
121+
$handler->display->display_options['empty']['php']['id'] = 'php';
122+
$handler->display->display_options['empty']['php']['table'] = 'views';
123+
$handler->display->display_options['empty']['php']['field'] = 'php';
124+
$handler->display->display_options['empty']['php']['label'] = 'Ingen Resultater';
125+
$handler->display->display_options['empty']['php']['empty'] = TRUE;
126+
$handler->display->display_options['empty']['php']['php_output'] = '<?php if (count($view->exposed_input)) : ?>
127+
<span class="no-results">Vi finder desværre ikke nogen sager ud fra de valgte søgekriterier. Prøv at justere på dit søgeord eller tidsintervallet.</span>
128+
<?php endif; ?>
129+
';
122130
/* Forbindelse: Entity Reference: Refereret entity */
123131
$handler->display->display_options['relationships']['field_os2web_cp_service_doc_ref_target_id']['id'] = 'field_os2web_cp_service_doc_ref_target_id';
124132
$handler->display->display_options['relationships']['field_os2web_cp_service_doc_ref_target_id']['table'] = 'field_data_field_os2web_cp_service_doc_ref';
@@ -130,7 +138,14 @@ function os2web_cp_service_views_default_views() {
130138
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['label'] = '';
131139
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['exclude'] = TRUE;
132140
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['element_label_colon'] = FALSE;
133-
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['group_column'] = 'entity_id';
141+
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['group_columns'] = array(
142+
'bundle' => 'bundle',
143+
'language' => 'language',
144+
'entity_type' => 'entity_type',
145+
'entity_id' => 'entity_id',
146+
'value' => 'value',
147+
'format' => 'format',
148+
);
134149
/* Felt: Indhold: Indholdsbeskrivelse */
135150
$handler->display->display_options['fields']['field_os2web_cp_service_content']['id'] = 'field_os2web_cp_service_content';
136151
$handler->display->display_options['fields']['field_os2web_cp_service_content']['table'] = 'field_data_field_os2web_cp_service_content';
@@ -371,6 +386,7 @@ return TRUE; // If no exposed inputs, remove all results
371386
t('‹ Forrige'),
372387
t('Næste ›'),
373388
t('Sidste »'),
389+
t('Ingen Resultater'),
374390
t('Indhold entity refereret fra field_os2web_cp_service_doc_ref'),
375391
t('Sagstitel'),
376392
t('[title]'),

0 commit comments

Comments
 (0)