Selaa lähdekoodia

Fixes made during deployment

Yves Chedemois 15 vuotta sitten
vanhempi
sitoutus
58a58ee6a1

+ 9 - 12
fgcf.features.content.inc

@@ -173,18 +173,19 @@ o|Oui',
     'module' => 'content_taxonomy',
     'active' => '1',
     'save_term_node' => 0,
-    'vid' => '2',
+    'vid' => '7',
     'parent' => '0',
     'parent_php_code' => '',
     'depth' => '',
     'widget' => array(
+      'new_terms' => 'insert',
+      'extra_parent' => '0',
+      'maxlength' => '255',
+      'active_tags' => NULL,
       'group_parent' => '0',
       'show_depth' => 1,
       'default_value' => NULL,
       'default_value_php' => NULL,
-      'new_terms' => 'insert',
-      'extra_parent' => '0',
-      'maxlength' => '255',
       'label' => 'Format de cours',
       'weight' => '11',
       'description' => '',
@@ -556,7 +557,7 @@ o|Oui',
     'module' => 'content_taxonomy',
     'active' => '1',
     'save_term_node' => 0,
-    'vid' => '5',
+    'vid' => '10',
     'parent' => '0',
     'parent_php_code' => '',
     'depth' => '',
@@ -565,11 +566,7 @@ o|Oui',
       'extra_parent' => '0',
       'maxlength' => '255',
       'active_tags' => NULL,
-      'default_value' => array(
-        '0' => array(
-          'value' => '31',
-        ),
-      ),
+      'default_value' => NULL,
       'default_value_php' => NULL,
       'label' => 'Public visé',
       'weight' => '14',
@@ -684,7 +681,7 @@ o|Oui',
     'module' => 'content_taxonomy',
     'active' => '1',
     'save_term_node' => 0,
-    'vid' => '4',
+    'vid' => '9',
     'parent' => '0',
     'parent_php_code' => '',
     'depth' => '',
@@ -745,7 +742,7 @@ o|Oui',
     'module' => 'content_taxonomy',
     'active' => '1',
     'save_term_node' => 0,
-    'vid' => '3',
+    'vid' => '8',
     'parent' => '0',
     'parent_php_code' => '',
     'depth' => '',

+ 2 - 1
fgcf.info

@@ -1,6 +1,6 @@
 _info_file_ctime = "1278499572"
 core = "6.x"
-datestamp = "1278499572"
+datestamp = "1279896445"
 dependencies[] = "content_taxonomy_autocomplete"
 dependencies[] = "diff"
 dependencies[] = "features"
@@ -39,4 +39,5 @@ features[user][] = "access course catalog"
 name = "FG Catalogue Formation"
 package = "Features"
 project = "fgcf"
+project status url = "http://features.osinet.eu/fserver"
 version = "6.x-1.0"

+ 7 - 9
fgcf.module

@@ -16,7 +16,7 @@ function fgcf_menu() {
   $items = array();
 
   $items['fgcf'] = array(
-    'title' => 'Catalogue Formations',
+    'title' => 'Catalogue formations',
     'page callback' => 'fgcf_page_home',
     'access arguments' => $read_access,
     'menu_name' => 'primary-links',
@@ -39,12 +39,11 @@ function fgcf_menu() {
     'page callback' => 'fgcf_page_thematique',
     'access arguments' => $read_access,
   );
-  // Debug page - no access on production.
-//  $items['fgcf/odt'] = array(
-//    'title' => 'ODT Test',
-//    'page callback' => 'fgcf_page_odt',
-//    'access arguments' => $read_access,
-//  );
+  $items['fgcf/odt'] = array(
+    'title' => 'ODT Test',
+    'page callback' => 'fgcf_page_odt',
+    'access arguments' => array('create fgcf_fiche content'),
+  );
   return $items;
 }
 
@@ -237,8 +236,7 @@ function fgcf_page_organisme() {
 
   $filter_form = drupal_get_form('fgcf_filter_form');
 
-  $ret = $filter_form;
-  $ret .= views_embed_view('fgcf_organismes_de_formation');
+  $ret = views_embed_view('fgcf_organismes_de_formation');
 
   return $ret;
 }

+ 0 - 1
views/fgcf_formations_par_organisme.php

@@ -231,7 +231,6 @@ $handler->override_option('cache', array(
   'type' => 'none',
 ));
 $handler->override_option('title', 'Formations proposées');
-$handler->override_option('empty', 'pas de résultat');
 $handler->override_option('empty_format', '1');
 $handler->override_option('items_per_page', 0);
 $handler->override_option('style_plugin', 'table');

+ 0 - 16
views/fgcf_thematiques_premier_niveau.php

@@ -148,22 +148,6 @@ $handler->override_option('arguments', array(
   ),
 ));
 $handler->override_option('filters', array(
-  'vid' => array(
-    'operator' => 'in',
-    'value' => array(
-      '1' => 1,
-    ),
-    'group' => '0',
-    'exposed' => FALSE,
-    'expose' => array(
-      'operator' => FALSE,
-      'label' => '',
-    ),
-    'id' => 'vid',
-    'table' => 'term_data',
-    'field' => 'vid',
-    'relationship' => 'none',
-  ),
   'status_extra' => array(
     'operator' => '=',
     'value' => '',