Merge branch 'develop' of github.com:OS2web/os2web_cp_service into develop

Conflicts:
	os2web_cp_service.module

Author: Stanislav

.gitignore

@@ -1020,6 +1020,117 @@ function os2web_cp_service_field_default_fields() {
     ),
   );
 
+  // Exported field: 'node-os2web_cp_service_cp_case-field_os2web_cp_service_searchmt'.
+  $fields['node-os2web_cp_service_cp_case-field_os2web_cp_service_searchmt'] = array(
+    'field_config' => array(
+      'active' => '1',
+      'cardinality' => '1',
+      'deleted' => '0',
+      'entity_types' => array(),
+      'field_name' => 'field_os2web_cp_service_searchmt',
+      'foreign keys' => array(
+        'format' => array(
+          'columns' => array(
+            'format' => 'format',
+          ),
+          'table' => 'filter_format',
+        ),
+      ),
+      'indexes' => array(
+        'format' => array(
+          0 => 'format',
+        ),
+      ),
+      'locked' => '0',
+      'module' => 'text',
+      'settings' => array(),
+      'translatable' => '0',
+      'type' => 'text_long',
+    ),
+    'field_instance' => array(
+      'bundle' => 'os2web_cp_service_cp_case',
+      'default_value' => NULL,
+      'deleted' => '0',
+      'description' => '',
+      'display' => array(
+        'default' => array(
+          'label' => 'above',
+          'module' => 'text',
+          'settings' => array(),
+          'type' => 'text_default',
+          'weight' => 23,
+        ),
+        'related_block' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+        'teaser' => array(
+          'label' => 'above',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 0,
+        ),
+      ),
+      'entity_type' => 'node',
+      'field_name' => 'field_os2web_cp_service_searchmt',
+      'label' => 'Search Metadata',
+      'required' => 0,
+      'settings' => array(
+        'better_formats' => array(
+          'allowed_formats' => array(
+            'blokindhold' => 'blokindhold',
+            'filtered_html' => 'filtered_html',
+            'full_html' => 'full_html',
+            'php_code' => 'php_code',
+            'plain_text' => 'plain_text',
+            'raw' => 'raw',
+          ),
+          'allowed_formats_toggle' => 0,
+          'default_order_toggle' => 0,
+          'default_order_wrapper' => array(
+            'formats' => array(
+              'blokindhold' => array(
+                'weight' => '-7',
+              ),
+              'filtered_html' => array(
+                'weight' => '-10',
+              ),
+              'full_html' => array(
+                'weight' => '-9',
+              ),
+              'php_code' => array(
+                'weight' => '-6',
+              ),
+              'plain_text' => array(
+                'weight' => '-8',
+              ),
+              'raw' => array(
+                'weight' => '0',
+              ),
+            ),
+          ),
+        ),
+        'linkit' => array(
+          'enable' => 0,
+          'insert_plugin' => '',
+        ),
+        'text_processing' => '0',
+        'user_register_form' => FALSE,
+      ),
+      'widget' => array(
+        'active' => 1,
+        'module' => 'text',
+        'settings' => array(
+          'rows' => '5',
+        ),
+        'type' => 'text_textarea',
+        'weight' => '40',
+      ),
+    ),
+  );
+
   // Exported field: 'node-os2web_cp_service_cp_case-field_os2web_cp_service_status'.
   $fields['node-os2web_cp_service_cp_case-field_os2web_cp_service_status'] = array(
     'field_config' => array(
@@ -2237,6 +2348,7 @@ function os2web_cp_service_field_default_fields() {
   t('Sagsstatus - Sagstypebetegnelse');
   t('Sagstitel');
   t('Sagstype - Sagstype');
+  t('Search Metadata');
   t('SystemID');
   t('TriggerRules');
 

LICENSE.txt

@@ -17,7 +17,6 @@ dependencies[] = menu
 dependencies[] = node
 dependencies[] = number
 dependencies[] = options
-;dependencies[] = os2web_acadre_esdh
 dependencies[] = page_manager
 dependencies[] = panels
 dependencies[] = pathauto
@@ -45,6 +44,7 @@ features[field][] = node-os2web_cp_service_cp_case-field_os2web_cp_service_kle_r
 features[field][] = node-os2web_cp_service_cp_case-field_os2web_cp_service_org_unit
 features[field][] = node-os2web_cp_service_cp_case-field_os2web_cp_service_property
 features[field][] = node-os2web_cp_service_cp_case-field_os2web_cp_service_rules
+features[field][] = node-os2web_cp_service_cp_case-field_os2web_cp_service_searchmt
 features[field][] = node-os2web_cp_service_cp_case-field_os2web_cp_service_status
 features[field][] = node-os2web_cp_service_cp_case-field_os2web_cp_service_sysid
 features[field][] = node-os2web_cp_service_cp_document-field_os2web_cp_service_case_id

README.md

@@ -57,4 +57,11 @@ function os2web_cp_service_schema() {
        'primary key' => array('case_nid'),
     );
     return $schema;
-}
+}
+
+/**
+ * Update method installing the module's database without a need to uninstall/install it.
+ */
+function os2web_cp_service_update_7100(){
+  drupal_install_schema('os2web_cp_service');
+}