Browse Source

minor last minute fixes to the submission form

Shawna Spoor 6 năm trước cách đây
mục cha
commit
71a0eb7a61
2 tập tin đã thay đổi với 5 bổ sung6 xóa
  1. 3 3
      tripal/includes/tripal.registration.inc
  2. 2 3
      tripal/tripal.module

+ 3 - 3
tripal/includes/tripal.registration.inc

@@ -164,7 +164,7 @@ function tripal_registration_form($form, &$form_state) {
   if (!empty($form_data)) {
     $form['submit'] = array(
       '#type' => 'submit',
-      '#value' => 'Update registeration information',
+      '#value' => 'Update registration information',
     );
   }
   else {
@@ -234,7 +234,7 @@ function tripal_registration_form_submit($form, &$form_state) {
 
 function tripal_registration_remote_submit($data) {
   global $base_url;
-  $endpoint = 'http://localhost/tripal30';
+  $endpoint = 'http://upgrade.tripal.info/web/registration/content/50619jdi8ciayjhygidf';
   //Are we getting the modules?
   $form_data = unserialize($data);
   if ($form_data['values']['tripal_reg_site_modules']) {
@@ -291,5 +291,5 @@ function tripal_registration_remote_submit($data) {
     'headers' => array('Content-Type' => 'application/json', 'Accept' => 'application/json'),
     'data' => json_encode($outgoing_data),
   ));
-
+  dpm($result);
 }

+ 2 - 3
tripal/tripal.module

@@ -83,11 +83,10 @@ function tripal_init() {
   // otherwise PostgreSQL version that may have a different datestyle setting
   // will fail when inserting or updating a date column in a table.
   db_query("SET DATESTYLE TO :style", array(':style' => 'MDY'));
-
-  dpm(variable_get('disable_tripal_reporting'));
+  
   //Ask users to do the registration form
   if (user_access('administer tripal')) {
-    if (!variable_get('tripal_site_registration', FALSE) || (variable_get('disable_tripal_reporting', FALSE))) {
+    if (empty(variable_get('tripal_site_registration', FALSE)) || !(variable_get('disable_tripal_reporting', FALSE))) {
       drupal_set_message('Please register your Tripal Site. Registering gives the developers important reporting
       information that will help us secure funding to continue making better Tripal versions. ' .
         l('Please register now.', 'admin/tripal/register'), 'warning');