Skip to content

Commit ebc25c1

Browse files
andersbryrupandersbryrup
committed
Merge branch 'develop'
2 parents a7cbc01 + bd86fb7 commit ebc25c1

File tree

5 files changed

+59
-20
lines changed

5 files changed

+59
-20
lines changed

‎js/os2web_cp_service.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
* os2web_cp_service.js
44
*/
55

6-
jQuery(document).ready(function($) {
6+
(function ($) {
7+
$(document).ready(function() {
78
// Convert all nonalphanumeric chars to /.
89
$('#views-exposed-form-os2web-cp-service-cp-case-search-panel-pane-1').submit(function() {
9-
var value = $('#edit-case-id').val();
10-
$('#edit-case-id').val(value.replace(/\W/g, '/'));
11-
value = $('#edit-doc-id').val();
12-
$('#edit-doc-id').val(value.replace(/\W/g, '/'));
10+
// IE fix. Value and placeolder is the same on IE.
11+
if($('#edit-case-id').attr('placeholder') !== $('#edit-case-id').val()) {
12+
var value = $('#edit-case-id').val();
13+
$('#edit-case-id').val(value.replace(/\W/g, '/'));
14+
}
1315
});
1416

1517
$( "a.qtip-this[title]" ).qtip({
@@ -35,5 +37,5 @@ jQuery(document).ready(function($) {
3537
}
3638
}
3739
});
38-
39-
});
40+
});
41+
})(jQuery);

‎os2web_cp_service.context.inc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@ function os2web_cp_service_context_default_contexts() {
2626
),
2727
);
2828
$context->reactions = array(
29+
'block' => array(
30+
'blocks' => array(
31+
'views-sitestuktur-block_2' => array(
32+
'module' => 'views',
33+
'delta' => 'sitestuktur-block_2',
34+
'region' => 'sidebar_first',
35+
'weight' => '-74',
36+
),
37+
'menu-menu-mega-menu-borger' => array(
38+
'module' => 'menu',
39+
'delta' => 'menu-mega-menu-borger',
40+
'region' => 'sidebar_first',
41+
'weight' => '-73',
42+
),
43+
),
44+
),
2945
'delta' => array(
3046
'delta_template' => 'hide_second_sidebar',
3147
),

‎os2web_cp_service.info

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description = This feature provides the content publishing services. Requires a
33
core = 7.x
44
package = OS2Web - Frontend
55
php = 5.2.4
6-
version = 7.x-1.01
6+
version = 7.x-1.0-beta1
77
project = os2web_cp_service
88
dependencies[] = context
99
dependencies[] = ctools
@@ -13,6 +13,7 @@ dependencies[] = date_views
1313
dependencies[] = entityreference
1414
dependencies[] = features
1515
dependencies[] = list
16+
dependencies[] = menu
1617
dependencies[] = node
1718
dependencies[] = number
1819
dependencies[] = options

‎os2web_cp_service.module

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function os2web_gf_service_handler($file_id) {
132132
* @param string $value
133133
* The value of the conf, which has to be altered/stored.
134134
*/
135-
function os2web_cs_service_alter_configuration($key, $value) {
135+
function os2web_cp_service_alter_configuration($key, $value) {
136136
switch ($key) {
137137
case 'FileServiceURL':
138138
return variable_set('os2web_cp_service_cp_document_fileurl', $value);
@@ -150,9 +150,11 @@ function os2web_cs_service_alter_configuration($key, $value) {
150150
* @return bool
151151
* TRUE on successful content creation.
152152
*/
153-
function os2web_cs_service_create_case(array $data) {
153+
function os2web_cp_service_create_case(array $data) {
154+
155+
watchdog('os2web_cp_service', 'CP case start: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
154156
// Prepare data.
155-
$data = array_replace_recursive(os2web_cs_service_default_case(), $data);
157+
$data = array_replace_recursive(os2web_cp_service_default_case(), $data);
156158

157159
$query = new EntityFieldQuery();
158160
$result = $query
@@ -170,6 +172,7 @@ function os2web_cs_service_create_case(array $data) {
170172
else {
171173
$node = node_load(array_pop($nids));
172174
}
175+
watchdog('os2web_cp_service', 'CP old deleted: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
173176

174177
// See if the triggered rules on the published node, is approved
175178
// in the vocabulary. Otherwise the node will be unpublished.
@@ -197,7 +200,9 @@ function os2web_cs_service_create_case(array $data) {
197200

198201
switch ($data['fields']['Sagstype - Sagstype']) {
199202
case 'EJSAG':
200-
$node->title = (string) $data['fields']['Sagstitel'] . ' - ' . $data['fields']['Sagsindhold'];
203+
// Old cases comes as: "Birkevej (8410) 11, 8410 Rønde"
204+
// regex removes " (8410)"
205+
$node->title = (string) preg_replace('/\s\(\d{4}\)/', '', $data['fields']['Sagstitel']) . ' - ' . $data['fields']['Sagsindhold'];
201206
break;
202207

203208
default:
@@ -274,6 +279,7 @@ function os2web_cs_service_create_case(array $data) {
274279
try {
275280
node_submit($node);
276281
node_save($node);
282+
watchdog('os2web_cp_service', 'CP case done: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
277283
return TRUE;
278284
}
279285
catch (Exception $e) {
@@ -285,7 +291,7 @@ function os2web_cs_service_create_case(array $data) {
285291
/**
286292
* Default array structure for a case.
287293
*/
288-
function os2web_cs_service_default_case() {
294+
function os2web_cp_service_default_case() {
289295
return array(
290296
'type' => 'case',
291297
'rules' => array(),
@@ -394,8 +400,10 @@ function os2web_cs_service_default_case() {
394400
* @return bool
395401
* TRUE on successful content creation.
396402
*/
397-
function os2web_cs_service_create_document(array $data) {
398-
$data = array_replace_recursive(os2web_cs_service_default_document(), $data);
403+
function os2web_cp_service_create_document(array $data) {
404+
405+
watchdog('os2web_cp_service', 'CP document start: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
406+
$data = array_replace_recursive(os2web_cp_service_default_document(), $data);
399407
// Prepare data.
400408
$query = new EntityFieldQuery();
401409
$result = $query
@@ -413,6 +421,7 @@ function os2web_cs_service_create_document(array $data) {
413421
else {
414422
$node = node_load(array_pop($nids));
415423
}
424+
watchdog('os2web_cp_service', 'CP old deleted: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
416425

417426
// See if the triggered rules on the published node, is approved
418427
// in the vocabulary. Otherwise the node will be unpublished.
@@ -511,13 +520,14 @@ function os2web_cs_service_create_document(array $data) {
511520
}
512521
}
513522
}
523+
watchdog('os2web_cp_service', 'CP document done: %time', array('%time' => timer_read('cp')), WATCHDOG_NOTICE);
514524
return TRUE;
515525
}
516526

517527
/**
518528
* Default array structure for a case.
519529
*/
520-
function os2web_cs_service_default_document() {
530+
function os2web_cp_service_default_document() {
521531
return array(
522532
'type' => 'document',
523533
'rules' => array(),

‎os2web_cp_service.views_default.inc

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -703,12 +703,21 @@ return TRUE; // If no exposed inputs, remove all results
703703
$handler->display->display_options['fields']['title']['id'] = 'title';
704704
$handler->display->display_options['fields']['title']['table'] = 'node';
705705
$handler->display->display_options['fields']['title']['field'] = 'title';
706-
$handler->display->display_options['fields']['title']['alter']['alter_text'] = TRUE;
706+
$handler->display->display_options['fields']['title']['label'] = '';
707+
$handler->display->display_options['fields']['title']['exclude'] = TRUE;
707708
$handler->display->display_options['fields']['title']['alter']['text'] = '[title] <br>[nothing]';
708709
$handler->display->display_options['fields']['title']['alter']['path'] = 'aaben-indsigt?search-text=[title]';
709-
$handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
710-
$handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
710+
$handler->display->display_options['fields']['title']['alter']['max_length'] = '70';
711+
$handler->display->display_options['fields']['title']['alter']['trim'] = TRUE;
712+
$handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
711713
$handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
714+
/* Felt: Global: Tilpasset tekst */
715+
$handler->display->display_options['fields']['nothing_1']['id'] = 'nothing_1';
716+
$handler->display->display_options['fields']['nothing_1']['table'] = 'views';
717+
$handler->display->display_options['fields']['nothing_1']['field'] = 'nothing';
718+
$handler->display->display_options['fields']['nothing_1']['label'] = 'Titel';
719+
$handler->display->display_options['fields']['nothing_1']['alter']['text'] = '[title] <br> [nothing]';
720+
$handler->display->display_options['fields']['nothing_1']['element_label_colon'] = FALSE;
712721
/* Felt: Indhold: SagsID */
713722
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['id'] = 'field_os2web_cp_service_case_id';
714723
$handler->display->display_options['fields']['field_os2web_cp_service_case_id']['table'] = 'field_data_field_os2web_cp_service_case_id';
@@ -732,7 +741,7 @@ return TRUE; // If no exposed inputs, remove all results
732741
$handler->display->display_options['fields']['field_os2web_cp_service_date']['label'] = 'Dato';
733742
$handler->display->display_options['fields']['field_os2web_cp_service_date']['element_label_colon'] = FALSE;
734743
$handler->display->display_options['fields']['field_os2web_cp_service_date']['settings'] = array(
735-
'format_type' => 'short',
744+
'format_type' => 'os2web_cp_service_date_only',
736745
'fromto' => 'both',
737746
'multiple_number' => '',
738747
'multiple_from' => '',
@@ -798,6 +807,7 @@ return TRUE; // If no exposed inputs, remove all results
798807
t('<h2>Sags Nr.: [field_os2web_cp_service_case_id]</h2>'),
799808
t('Se alle sager på denne addresse'),
800809
t('[title] <br>[nothing]'),
810+
t('[title] <br> [nothing]'),
801811
);
802812
$export['os2web_cp_service_cp_case_view'] = $view;
803813

0 commit comments

Comments
 (0)