소스 검색

Fixed minor bugs

Stephen Ficklin 7 년 전
부모
커밋
8fb5965293
4개의 변경된 파일10개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 0
      tripal/includes/tripal.fields.inc
  2. 1 1
      tripal/theme/js/TripalUploadFile.js
  3. 3 3
      tripal_chado/tripal_chado.module
  4. 5 3
      tripal_chado_views/tripal_chado_views.views.inc

+ 1 - 0
tripal/includes/tripal.fields.inc

@@ -338,6 +338,7 @@ function tripal_form_field_ui_field_overview_form_submit($form, &$form_state) {
       $type = $form_values['_add_new_field']['type'];
       if (tripal_load_include_field_class($type)) {
         $module = $type::$module;
+        dpm($module);
         $function = $module . '_bundle_create_user_field';
         $bundle = tripal_load_bundle_entity(array('name' => $form['#bundle']));
         $field_name = $form_values['_add_new_field']['field_name'];

+ 1 - 1
tripal/theme/js/TripalUploadFile.js

@@ -13,7 +13,7 @@
     this.file = file;
     this.options = options;
     this.file_size = file.size;
-    this.chunk_size = (1024 * 2000); // 2024MB
+    this.chunk_size = (1024 * 2000); 
     this.total_chunks = ((this.file.size % this.chunk_size == 0) ? Math.floor(this.file.size / this.chunk_size) : Math.floor(this.file.size / this.chunk_size) + 1); 
     this.curr_chunk = 0;
     this.status = 'pending';

+ 3 - 3
tripal_chado/tripal_chado.module

@@ -591,7 +591,7 @@ function tripal_chado_menu() {
     'title' => 'Edit a Controlled Vocabulary',
     'description' => 'Edit the details such as name and description for an existing controlled vocabulary.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('tripal_cv_cv_edit_form', 5),
+    'page arguments' => array('tripal_cv_cv_edit_form', 6),
     'access callback' => 'user_access',
     'access arguments' => array('administer controlled vocabularies'),
     'file' => 'includes/tripal_chado.cv.inc',
@@ -613,7 +613,7 @@ function tripal_chado_menu() {
     'title' => 'Add a Controlled Vocabulary Term',
     'description' => 'Add a new controlled vocabulary term.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('tripal_cv_cvterm_add_form', 4),
+    'page arguments' => array('tripal_cv_cvterm_add_form', 5),
     'access arguments' => array('administer controlled vocabularies'),
     'file' => 'includes/tripal_chado.cv.inc',
     'file path' => drupal_get_path('module', 'tripal_chado'),
@@ -633,7 +633,7 @@ function tripal_chado_menu() {
     'title' => 'Edit a Controlled Vocabulary Term',
     'description' => 'Edit an existing controlled vocabulary term.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('tripal_cv_cvterm_edit_form', 4, 7),
+    'page arguments' => array('tripal_cv_cvterm_edit_form', 5, 8),
     'access arguments' => array('administer controlled vocabularies'),
     'file' => 'includes/tripal_chado.cv.inc',
     'file path' => drupal_get_path('module', 'tripal_chado'),

+ 5 - 3
tripal_chado_views/tripal_chado_views.views.inc

@@ -176,10 +176,12 @@ function tripal_chado_views_views_data() {
       $sql = "SELECT name, mv_specs FROM {tripal_mviews} WHERE mview_id = :id";
       $mview_table = db_query($sql, array(':id' => $mview_id));
       $mview_table = $mview_table->fetchObject();
-      $base_table = $mview_table->name;
+      if ($mview_table) {
+        $base_table = $mview_table->name;
 
-      if (!empty($mview_table->mv_specs)) {
-        $legacy_mview = TRUE;
+        if (!empty($mview_table->mv_specs)) {
+          $legacy_mview = TRUE;
+        }
       }
     }