Skip to content
This repository was archived by the owner on May 2, 2018. It is now read-only.

Commit 837b39f

Browse files
kaspergkasperg
committed
Merge pull request dingproject#10 from ding2tal/core-pr-5
Core pr 5
2 parents ab724d2 + e22dcd6 commit 837b39f

File tree

11 files changed

+310
-58
lines changed

11 files changed

+310
-58
lines changed

‎alma.features.field_base.inc‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,88 @@ function alma_field_default_field_bases() {
385385
),
386386
);
387387

388+
// Exported field_base: 'field_alma_sms'
389+
$field_bases['field_alma_sms'] = array(
390+
'active' => 1,
391+
'cardinality' => 1,
392+
'deleted' => 0,
393+
'entity_types' => array(),
394+
'field_name' => 'field_alma_sms',
395+
'foreign keys' => array(
396+
'format' => array(
397+
'columns' => array(
398+
'format' => 'format',
399+
),
400+
'table' => 'filter_format',
401+
),
402+
),
403+
'indexes' => array(
404+
'format' => array(
405+
0 => 'format',
406+
),
407+
),
408+
'locked' => 0,
409+
'module' => 'text',
410+
'settings' => array(
411+
'max_length' => 255,
412+
'profile2_private' => 0,
413+
),
414+
'storage' => array(
415+
'active' => 1,
416+
'module' => 'virtual_field',
417+
'settings' => array(),
418+
'type' => 'virtual_field',
419+
),
420+
'translatable' => 0,
421+
'type' => 'text',
422+
'virtual_field' => array(
423+
'entity_types' => array(
424+
0 => 'profile2',
425+
),
426+
),
427+
);
428+
429+
// Exported field_base: 'field_alma_sms_id'
430+
$field_bases['field_alma_sms_id'] = array(
431+
'active' => 1,
432+
'cardinality' => 1,
433+
'deleted' => 0,
434+
'entity_types' => array(),
435+
'field_name' => 'field_alma_sms_id',
436+
'foreign keys' => array(
437+
'format' => array(
438+
'columns' => array(
439+
'format' => 'format',
440+
),
441+
'table' => 'filter_format',
442+
),
443+
),
444+
'indexes' => array(
445+
'format' => array(
446+
0 => 'format',
447+
),
448+
),
449+
'locked' => 0,
450+
'module' => 'text',
451+
'settings' => array(
452+
'max_length' => 255,
453+
'profile2_private' => 0,
454+
),
455+
'storage' => array(
456+
'active' => 1,
457+
'module' => 'virtual_field',
458+
'settings' => array(),
459+
'type' => 'virtual_field',
460+
),
461+
'translatable' => 0,
462+
'type' => 'text',
463+
'virtual_field' => array(
464+
'entity_types' => array(
465+
0 => 'profile2',
466+
),
467+
),
468+
);
469+
388470
// Exported field_base: 'field_alma_street_name'
389471
$field_bases['field_alma_street_name'] = array(
390472
'active' => 1,

‎alma.features.field_instance.inc‎

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function alma_field_default_field_instances() {
2121
'label' => 'hidden',
2222
'settings' => array(),
2323
'type' => 'hidden',
24-
'weight' => 9,
24+
'weight' => 10,
2525
),
2626
),
2727
'entity_type' => 'profile2',
@@ -36,7 +36,7 @@ function alma_field_default_field_instances() {
3636
'module' => 'virtual_field',
3737
'settings' => array(),
3838
'type' => 'hidden',
39-
'weight' => 9,
39+
'weight' => 10,
4040
),
4141
);
4242

@@ -118,7 +118,7 @@ function alma_field_default_field_instances() {
118118
'module' => 'list',
119119
'settings' => array(),
120120
'type' => 'list_default',
121-
'weight' => 8,
121+
'weight' => 9,
122122
),
123123
),
124124
'entity_type' => 'profile2',
@@ -182,7 +182,7 @@ function alma_field_default_field_instances() {
182182
'module' => 'text',
183183
'settings' => array(),
184184
'type' => 'text_default',
185-
'weight' => 5,
185+
'weight' => 6,
186186
),
187187
),
188188
'entity_type' => 'profile2',
@@ -200,7 +200,7 @@ function alma_field_default_field_instances() {
200200
'size' => 12,
201201
),
202202
'type' => 'text_textfield',
203-
'weight' => 8,
203+
'weight' => 9,
204204
),
205205
);
206206

@@ -215,7 +215,7 @@ function alma_field_default_field_instances() {
215215
'label' => 'hidden',
216216
'settings' => array(),
217217
'type' => 'hidden',
218-
'weight' => 10,
218+
'weight' => 11,
219219
),
220220
),
221221
'entity_type' => 'profile2',
@@ -230,7 +230,7 @@ function alma_field_default_field_instances() {
230230
'module' => 'virtual_field',
231231
'settings' => array(),
232232
'type' => 'hidden',
233-
'weight' => 10,
233+
'weight' => 12,
234234
),
235235
);
236236

@@ -277,7 +277,7 @@ function alma_field_default_field_instances() {
277277
'module' => 'list',
278278
'settings' => array(),
279279
'type' => 'list_default',
280-
'weight' => 6,
280+
'weight' => 7,
281281
),
282282
),
283283
'entity_type' => 'profile2',
@@ -313,7 +313,7 @@ function alma_field_default_field_instances() {
313313
'multiple_to' => '',
314314
),
315315
'type' => 'date_default',
316-
'weight' => 7,
316+
'weight' => 8,
317317
),
318318
),
319319
'entity_type' => 'profile2',
@@ -345,6 +345,70 @@ function alma_field_default_field_instances() {
345345
),
346346
);
347347

348+
// Exported field_instance: 'profile2-provider_alma-field_alma_sms'
349+
$field_instances['profile2-provider_alma-field_alma_sms'] = array(
350+
'bundle' => 'provider_alma',
351+
'default_value' => NULL,
352+
'deleted' => 0,
353+
'description' => '',
354+
'display' => array(
355+
'default' => array(
356+
'label' => 'inline',
357+
'module' => 'text',
358+
'settings' => array(),
359+
'type' => 'text_default',
360+
'weight' => 5,
361+
),
362+
),
363+
'entity_type' => 'profile2',
364+
'field_name' => 'field_alma_sms',
365+
'label' => 'SMS',
366+
'required' => 0,
367+
'settings' => array(
368+
'text_processing' => 0,
369+
'user_register_form' => FALSE,
370+
),
371+
'widget' => array(
372+
'active' => 1,
373+
'module' => 'text',
374+
'settings' => array(
375+
'size' => 60,
376+
),
377+
'type' => 'text_textfield',
378+
'weight' => 8,
379+
),
380+
);
381+
382+
// Exported field_instance: 'profile2-provider_alma-field_alma_sms_id'
383+
$field_instances['profile2-provider_alma-field_alma_sms_id'] = array(
384+
'bundle' => 'provider_alma',
385+
'default_value' => NULL,
386+
'deleted' => 0,
387+
'description' => '',
388+
'display' => array(
389+
'default' => array(
390+
'label' => 'hidden',
391+
'settings' => array(),
392+
'type' => 'hidden',
393+
'weight' => 12,
394+
),
395+
),
396+
'entity_type' => 'profile2',
397+
'field_name' => 'field_alma_sms_id',
398+
'label' => 'SMS id',
399+
'required' => 0,
400+
'settings' => array(
401+
'text_processing' => 0,
402+
'user_register_form' => FALSE,
403+
),
404+
'widget' => array(
405+
'module' => 'virtual_field',
406+
'settings' => array(),
407+
'type' => 'hidden',
408+
'weight' => 11,
409+
),
410+
);
411+
348412
// Exported field_instance: 'profile2-provider_alma-field_alma_street_name'
349413
$field_instances['profile2-provider_alma-field_alma_street_name'] = array(
350414
'bundle' => 'provider_alma',
@@ -388,6 +452,8 @@ function alma_field_default_field_instances() {
388452
t('Postal code');
389453
t('Preferred branch');
390454
t('Reservation pause');
455+
t('SMS');
456+
t('SMS id');
391457
t('Set your reservations on pause.');
392458
t('Street name');
393459
t('The e-mail address is not made public and will only be used if you wish to receive certain news or notifications by e-mail.');

‎alma.info‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name = Alma
22
description = Implementation of Axiell’s Alma API for DDELibra.
33
core = 7.x
44
package = Providers
5-
php = 5.2.4
65
project = alma
76
dependencies[] = date
87
dependencies[] = ding_provider
@@ -16,7 +15,7 @@ dependencies[] = options
1615
dependencies[] = profile2
1716
dependencies[] = text
1817
dependencies[] = virtual_field
19-
features[features_api][] = api:1
18+
features[features_api][] = api:2
2019
features[field_base][] = field_alma_absent_id
2120
features[field_base][] = field_alma_city
2221
features[field_base][] = field_alma_full_name
@@ -27,6 +26,8 @@ features[field_base][] = field_alma_phone_id
2726
features[field_base][] = field_alma_postal_code
2827
features[field_base][] = field_alma_preferred_branch
2928
features[field_base][] = field_alma_reservation_pause
29+
features[field_base][] = field_alma_sms
30+
features[field_base][] = field_alma_sms_id
3031
features[field_base][] = field_alma_street_name
3132
features[field_instance][] = profile2-provider_alma-field_alma_absent_id
3233
features[field_instance][] = profile2-provider_alma-field_alma_city
@@ -38,6 +39,8 @@ features[field_instance][] = profile2-provider_alma-field_alma_phone_id
3839
features[field_instance][] = profile2-provider_alma-field_alma_postal_code
3940
features[field_instance][] = profile2-provider_alma-field_alma_preferred_branch
4041
features[field_instance][] = profile2-provider_alma-field_alma_reservation_pause
42+
features[field_instance][] = profile2-provider_alma-field_alma_sms
43+
features[field_instance][] = profile2-provider_alma-field_alma_sms_id
4144
features[field_instance][] = profile2-provider_alma-field_alma_street_name
4245
features[profile2_type][] = provider_alma
4346
files[] = alma.module

‎alma.install‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?php
2+
/**
3+
* @file
4+
* Handles requirements, installation and uninstall for the module.
5+
*/
26

37
/**
48
* Implements hook_requirements().
@@ -27,16 +31,6 @@ function alma_requirements($phase) {
2731
$requirements['alma']['description'] = $t('Alma is not properly configured, please visit <a href="@link">the settings page</a>.', array('@link' => url('admin/config/ding/provider/alma')));
2832
$requirements['alma']['severity'] = REQUIREMENT_ERROR;
2933
}
30-
$requirements['alma_wayf'] = array(
31-
'title' => $t('Alma WAYF'),
32-
'value' => $t('Alma WAYF configured'),
33-
'severity' => REQUIREMENT_OK,
34-
);
35-
if (!variable_get('wayf_hash', FALSE)) {
36-
$requirements['alma']['value'] = $t('Alma WAYF not configured');
37-
$requirements['alma']['description'] = $t('Alma WAYF is not properly configured, you need to set $conf[\'wayf_hash\'] in setttings.php.');
38-
$requirements['alma']['severity'] = REQUIREMENT_ERROR;
39-
}
4034
}
4135

4236
return $requirements;

‎alma.make‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ core = 7.x
44
; Contrib
55

66
projects[date][subdir] = "contrib"
7-
projects[date][version] = "2.6"
7+
projects[date][version] = "2.8"
88

99
projects[email][subdir] = "contrib"
10-
projects[email][version] = "1.2"
10+
projects[email][version] = "1.3"
1111

1212
projects[features][subdir] = "contrib"
13-
projects[features][version] = "2.0-beta2"
13+
projects[features][version] = "2.0"
1414

1515
projects[profile2][subdir] = "contrib"
1616
projects[profile2][version] = "1.3"
1717

1818
projects[virtual_field][subdir] = "contrib"
19-
projects[virtual_field][version] = "1.1"
19+
projects[virtual_field][version] = "1.2"
2020

2121
; Ding! modules
2222

0 commit comments

Comments
 (0)