Skip to content

Commit f08dead

Browse files
andersbryrupandersbryrup
committed
Merge branch 'hotfix-1.01'
2 parents 31de0b6 + 1f6ec82 commit f08dead

File tree

4 files changed

+291
-174
lines changed

4 files changed

+291
-174
lines changed

‎os2web_cp_service.features.field.inc

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ function os2web_cp_service_field_default_fields() {
5252
'type' => 'text_default',
5353
'weight' => '0',
5454
),
55+
'related_block' => array(
56+
'label' => 'above',
57+
'settings' => array(),
58+
'type' => 'hidden',
59+
'weight' => 0,
60+
),
5561
'teaser' => array(
5662
'label' => 'above',
5763
'settings' => array(),
@@ -140,6 +146,12 @@ function os2web_cp_service_field_default_fields() {
140146
'type' => 'list_default',
141147
'weight' => '2',
142148
),
149+
'related_block' => array(
150+
'label' => 'above',
151+
'settings' => array(),
152+
'type' => 'hidden',
153+
'weight' => 0,
154+
),
143155
'teaser' => array(
144156
'label' => 'above',
145157
'settings' => array(),
@@ -206,6 +218,12 @@ function os2web_cp_service_field_default_fields() {
206218
'type' => 'text_default',
207219
'weight' => 6,
208220
),
221+
'related_block' => array(
222+
'label' => 'above',
223+
'settings' => array(),
224+
'type' => 'hidden',
225+
'weight' => 0,
226+
),
209227
'teaser' => array(
210228
'label' => 'above',
211229
'settings' => array(),
@@ -283,6 +301,12 @@ function os2web_cp_service_field_default_fields() {
283301
'type' => 'date_default',
284302
'weight' => 10,
285303
),
304+
'related_block' => array(
305+
'label' => 'above',
306+
'settings' => array(),
307+
'type' => 'hidden',
308+
'weight' => 0,
309+
),
286310
'teaser' => array(
287311
'label' => 'above',
288312
'settings' => array(),
@@ -376,6 +400,12 @@ function os2web_cp_service_field_default_fields() {
376400
'type' => 'entityreference_label',
377401
'weight' => 14,
378402
),
403+
'related_block' => array(
404+
'label' => 'above',
405+
'settings' => array(),
406+
'type' => 'hidden',
407+
'weight' => 0,
408+
),
379409
'teaser' => array(
380410
'label' => 'above',
381411
'settings' => array(),
@@ -443,6 +473,12 @@ function os2web_cp_service_field_default_fields() {
443473
'type' => 'hidden',
444474
'weight' => '3',
445475
),
476+
'related_block' => array(
477+
'label' => 'above',
478+
'settings' => array(),
479+
'type' => 'hidden',
480+
'weight' => 0,
481+
),
446482
'teaser' => array(
447483
'label' => 'above',
448484
'settings' => array(),
@@ -512,6 +548,12 @@ function os2web_cp_service_field_default_fields() {
512548
'type' => 'text_default',
513549
'weight' => 19,
514550
),
551+
'related_block' => array(
552+
'label' => 'above',
553+
'settings' => array(),
554+
'type' => 'hidden',
555+
'weight' => 0,
556+
),
515557
'teaser' => array(
516558
'label' => 'above',
517559
'settings' => array(),
@@ -597,6 +639,12 @@ function os2web_cp_service_field_default_fields() {
597639
'type' => 'list_default',
598640
'weight' => 9,
599641
),
642+
'related_block' => array(
643+
'label' => 'above',
644+
'settings' => array(),
645+
'type' => 'hidden',
646+
'weight' => 0,
647+
),
600648
'teaser' => array(
601649
'label' => 'above',
602650
'settings' => array(),
@@ -665,6 +713,12 @@ function os2web_cp_service_field_default_fields() {
665713
'type' => 'text_default',
666714
'weight' => 8,
667715
),
716+
'related_block' => array(
717+
'label' => 'above',
718+
'settings' => array(),
719+
'type' => 'hidden',
720+
'weight' => 0,
721+
),
668722
'teaser' => array(
669723
'label' => 'above',
670724
'settings' => array(),
@@ -740,6 +794,12 @@ function os2web_cp_service_field_default_fields() {
740794
'type' => 'taxonomy_term_reference_link',
741795
'weight' => 20,
742796
),
797+
'related_block' => array(
798+
'label' => 'above',
799+
'settings' => array(),
800+
'type' => 'hidden',
801+
'weight' => 0,
802+
),
743803
'teaser' => array(
744804
'label' => 'above',
745805
'settings' => array(),
@@ -806,6 +866,12 @@ function os2web_cp_service_field_default_fields() {
806866
'type' => 'text_default',
807867
'weight' => 17,
808868
),
869+
'related_block' => array(
870+
'label' => 'above',
871+
'settings' => array(),
872+
'type' => 'hidden',
873+
'weight' => 0,
874+
),
809875
'teaser' => array(
810876
'label' => 'above',
811877
'settings' => array(),
@@ -875,6 +941,12 @@ function os2web_cp_service_field_default_fields() {
875941
'type' => 'text_default',
876942
'weight' => '1',
877943
),
944+
'related_block' => array(
945+
'label' => 'above',
946+
'settings' => array(),
947+
'type' => 'hidden',
948+
'weight' => 0,
949+
),
878950
'teaser' => array(
879951
'label' => 'above',
880952
'settings' => array(),
@@ -944,6 +1016,12 @@ function os2web_cp_service_field_default_fields() {
9441016
'type' => 'text_default',
9451017
'weight' => '1',
9461018
),
1019+
'related_block' => array(
1020+
'label' => 'above',
1021+
'settings' => array(),
1022+
'type' => 'hidden',
1023+
'weight' => 0,
1024+
),
9471025
'teaser' => array(
9481026
'label' => 'above',
9491027
'settings' => array(),
@@ -1012,6 +1090,12 @@ function os2web_cp_service_field_default_fields() {
10121090
'type' => 'text_default',
10131091
'weight' => '11',
10141092
),
1093+
'related_block' => array(
1094+
'label' => 'above',
1095+
'settings' => array(),
1096+
'type' => 'hidden',
1097+
'weight' => 0,
1098+
),
10151099
'teaser' => array(
10161100
'label' => 'above',
10171101
'settings' => array(),
@@ -1079,6 +1163,12 @@ function os2web_cp_service_field_default_fields() {
10791163
'type' => 'text_default',
10801164
'weight' => '5',
10811165
),
1166+
'related_block' => array(
1167+
'label' => 'above',
1168+
'settings' => array(),
1169+
'type' => 'hidden',
1170+
'weight' => 0,
1171+
),
10821172
'teaser' => array(
10831173
'label' => 'above',
10841174
'settings' => array(),
@@ -1156,6 +1246,12 @@ function os2web_cp_service_field_default_fields() {
11561246
'type' => 'date_default',
11571247
'weight' => '7',
11581248
),
1249+
'related_block' => array(
1250+
'label' => 'above',
1251+
'settings' => array(),
1252+
'type' => 'hidden',
1253+
'weight' => 0,
1254+
),
11591255
'teaser' => array(
11601256
'label' => 'above',
11611257
'settings' => array(),
@@ -1233,6 +1329,12 @@ function os2web_cp_service_field_default_fields() {
12331329
'type' => 'text_default',
12341330
'weight' => '0',
12351331
),
1332+
'related_block' => array(
1333+
'label' => 'above',
1334+
'settings' => array(),
1335+
'type' => 'hidden',
1336+
'weight' => 0,
1337+
),
12361338
'teaser' => array(
12371339
'label' => 'above',
12381340
'settings' => array(),
@@ -1321,6 +1423,12 @@ function os2web_cp_service_field_default_fields() {
13211423
'type' => 'list_default',
13221424
'weight' => '6',
13231425
),
1426+
'related_block' => array(
1427+
'label' => 'above',
1428+
'settings' => array(),
1429+
'type' => 'hidden',
1430+
'weight' => 0,
1431+
),
13241432
'teaser' => array(
13251433
'label' => 'above',
13261434
'settings' => array(),
@@ -1395,6 +1503,12 @@ function os2web_cp_service_field_default_fields() {
13951503
'type' => 'date_default',
13961504
'weight' => '8',
13971505
),
1506+
'related_block' => array(
1507+
'label' => 'above',
1508+
'settings' => array(),
1509+
'type' => 'hidden',
1510+
'weight' => 0,
1511+
),
13981512
'teaser' => array(
13991513
'label' => 'above',
14001514
'settings' => array(),
@@ -1474,6 +1588,12 @@ function os2web_cp_service_field_default_fields() {
14741588
'type' => 'os2web_cp_service_file_formatter',
14751589
'weight' => '2',
14761590
),
1591+
'related_block' => array(
1592+
'label' => 'above',
1593+
'settings' => array(),
1594+
'type' => 'hidden',
1595+
'weight' => 0,
1596+
),
14771597
'teaser' => array(
14781598
'label' => 'above',
14791599
'settings' => array(),
@@ -1543,6 +1663,12 @@ function os2web_cp_service_field_default_fields() {
15431663
'type' => 'text_default',
15441664
'weight' => '10',
15451665
),
1666+
'related_block' => array(
1667+
'label' => 'above',
1668+
'settings' => array(),
1669+
'type' => 'hidden',
1670+
'weight' => 0,
1671+
),
15461672
'teaser' => array(
15471673
'label' => 'above',
15481674
'settings' => array(),
@@ -1609,6 +1735,12 @@ function os2web_cp_service_field_default_fields() {
16091735
'type' => 'hidden',
16101736
'weight' => '3',
16111737
),
1738+
'related_block' => array(
1739+
'label' => 'above',
1740+
'settings' => array(),
1741+
'type' => 'hidden',
1742+
'weight' => 0,
1743+
),
16121744
'teaser' => array(
16131745
'label' => 'above',
16141746
'settings' => array(),
@@ -1678,6 +1810,12 @@ function os2web_cp_service_field_default_fields() {
16781810
'type' => 'text_default',
16791811
'weight' => 12,
16801812
),
1813+
'related_block' => array(
1814+
'label' => 'above',
1815+
'settings' => array(),
1816+
'type' => 'hidden',
1817+
'weight' => 0,
1818+
),
16811819
'teaser' => array(
16821820
'label' => 'above',
16831821
'settings' => array(),
@@ -1775,6 +1913,12 @@ function os2web_cp_service_field_default_fields() {
17751913
'type' => 'taxonomy_term_reference_link',
17761914
'weight' => 13,
17771915
),
1916+
'related_block' => array(
1917+
'label' => 'above',
1918+
'settings' => array(),
1919+
'type' => 'hidden',
1920+
'weight' => 0,
1921+
),
17781922
'teaser' => array(
17791923
'label' => 'above',
17801924
'settings' => array(),
@@ -1841,6 +1985,12 @@ function os2web_cp_service_field_default_fields() {
18411985
'type' => 'text_default',
18421986
'weight' => '9',
18431987
),
1988+
'related_block' => array(
1989+
'label' => 'above',
1990+
'settings' => array(),
1991+
'type' => 'hidden',
1992+
'weight' => 0,
1993+
),
18441994
'teaser' => array(
18451995
'label' => 'above',
18461996
'settings' => array(),

‎os2web_cp_service.features.taxonomy.inc

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,21 @@
99
*/
1010
function os2web_cp_service_taxonomy_default_vocabularies() {
1111
return array(
12-
'os2web_cp_service_tax_rules' => array(
13-
'name' => 'CP Rules',
14-
'machine_name' => 'os2web_cp_service_tax_rules',
15-
'description' => 'Vocabulary of the different types of used rules',
16-
'hierarchy' => '0',
17-
'module' => 'taxonomy',
18-
'weight' => '0',
19-
'rdf_mapping' => array(
20-
'rdftype' => array(
21-
0 => 'skos:ConceptScheme',
22-
),
23-
'name' => array(
24-
'predicates' => array(
25-
0 => 'dc:title',
26-
),
27-
),
28-
'description' => array(
29-
'predicates' => array(
30-
0 => 'rdfs:comment',
31-
),
32-
),
33-
),
34-
),
3512
'os2web_cp_service_tax_approved_rules' => array(
3613
'name' => 'CP Approved Rules',
3714
'machine_name' => 'os2web_cp_service_tax_approved_rules',
3815
'description' => 'Trigger rules which are approved to be published',
3916
'hierarchy' => '0',
4017
'module' => 'taxonomy',
4118
'weight' => '0',
42-
'rdf_mapping' => array(
43-
'rdftype' => array(
44-
0 => 'skos:ConceptScheme',
45-
),
46-
'name' => array(
47-
'predicates' => array(
48-
0 => 'dc:title',
49-
),
50-
),
51-
'description' => array(
52-
'predicates' => array(
53-
0 => 'rdfs:comment',
54-
),
55-
),
56-
),
19+
),
20+
'os2web_cp_service_tax_rules' => array(
21+
'name' => 'CP Rules',
22+
'machine_name' => 'os2web_cp_service_tax_rules',
23+
'description' => 'Vocabulary of the different types of used rules',
24+
'hierarchy' => '0',
25+
'module' => 'taxonomy',
26+
'weight' => '0',
5727
),
5828
);
5929
}

0 commit comments

Comments
 (0)