Ignore field_loggeable-related code until it is implemented for all extra fields tables - refs BT#9070

1.10.x
Yannick Warnier 11 years ago
parent 09df06b659
commit 59ff6a0604
  1. 7
      main/inc/lib/extra_field.lib.php
  2. 6
      main/inc/lib/extra_field_value.lib.php

@ -16,7 +16,9 @@ class ExtraField extends Model
'field_visible', 'field_visible',
'field_changeable', 'field_changeable',
'field_filter', 'field_filter',
/* Enable this when field_loggeable is introduced as a table field (2.0)
'field_loggeable', 'field_loggeable',
*/
'tms' 'tms'
); );
@ -819,6 +821,7 @@ class ExtraField extends Model
array('id' => 'extra_'.$field_details['field_variable']) array('id' => 'extra_'.$field_details['field_variable'])
); );
/* Enable this when field_loggeable is introduced as a table field (2.0)
if ($optionsExists && $field_details['field_loggeable'] && !empty($defaultValueId)) { if ($optionsExists && $field_details['field_loggeable'] && !empty($defaultValueId)) {
$form->addElement( $form->addElement(
@ -867,6 +870,7 @@ class ExtraField extends Model
} }
} }
} }
*/
if (!$admin_permissions) { if (!$admin_permissions) {
if ($field_details['field_visible'] == 0) { if ($field_details['field_visible'] == 0) {
@ -1476,11 +1480,12 @@ EOF;
$group[] = $form->createElement('radio', 'field_filter', null, get_lang('No'), 0); $group[] = $form->createElement('radio', 'field_filter', null, get_lang('No'), 0);
$form->addGroup($group, '', get_lang('FieldFilter'), '', false); $form->addGroup($group, '', get_lang('FieldFilter'), '', false);
/* Enable this when field_loggeable is introduced as a table field (2.0)
$group = array(); $group = array();
$group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('Yes'), 1); $group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('Yes'), 1);
$group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('No'), 0); $group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('No'), 0);
$form->addGroup($group, '', get_lang('FieldLoggeable'), '', false); $form->addGroup($group, '', get_lang('FieldLoggeable'), '', false);
*/
$form->addElement('text', 'field_order', get_lang('FieldOrder'), array('class' => 'span1')); $form->addElement('text', 'field_order', get_lang('FieldOrder'), array('class' => 'span1'));

@ -347,7 +347,10 @@ class ExtraFieldValue extends Model
// Insert // Insert
if (empty($field_values)) { if (empty($field_values)) {
/* Enable this when field_loggeable is introduced as a table field (2.0)
if ($extra_field_info['field_loggeable'] == 1) { if ($extra_field_info['field_loggeable'] == 1) {
*/
if (false) {
global $app; global $app;
switch($this->type) { switch($this->type) {
case 'question': case 'question':
@ -406,7 +409,10 @@ class ExtraFieldValue extends Model
} }
} else { } else {
// Update // Update
/* Enable this when field_loggeable is introduced as a table field (2.0)
if ($extra_field_info['field_loggeable'] == 1) { if ($extra_field_info['field_loggeable'] == 1) {
*/
if (false) {
global $app; global $app;
switch($this->type) { switch($this->type) {
case 'question': case 'question':

Loading…
Cancel
Save