'; $object1_row= ''. $mod_strings['LBL_YOURS'] . ''; $object2_row= '' . $mod_strings['LBL_IN_DATABASE'] . ''; $exists = false; foreach( $field_defs as $name=>$ignore) { $value = $object_1[$name]; // FIXME: Replace the comparison here with a function from SugarWidgets if ( !is_scalar($value) || $name == 'team_name' ) { continue; } if( $value != $object_2->$name && !($object_2->$name instanceOf Link)){ $title .= ' ' . translate($field_defs[$name]['vname'], $module_dir). ''; $object1_row .= ' ' . $value. ''; $object2_row .= ' ' . $object_2->$name . ''; $exists = true; } } if($exists){ echo "{$mod_strings['LBL_CONFLICT_EXISTS']}$display_name
$title$object1_row$object2_row
 
{$mod_strings['LBL_ACCEPT_YOURS']}
{$mod_strings['LBL_ACCEPT_DATABASE']}

"; }else{ echo "{$mod_strings['LBL_RECORDS_MATCH']}
"; } } if(isset($_SESSION['o_lock_object'])){ global $beanFiles, $moduleList; $object = $_SESSION['o_lock_object']; require_once($beanFiles[$beanList[$_SESSION['o_lock_module']]]); $current_state = new $_SESSION['o_lock_class'](); $current_state->retrieve($object['id']); if(isset($_REQUEST['save'])){ $_SESSION['o_lock_fs'] = true; echo $_SESSION['o_lock_save']; die(); }else{ display_conflict_between_objects($object, $current_state, $current_state->field_defs, $current_state->module_dir, $_SESSION['o_lock_class']); }}else{ echo $mod_strings['LBL_NO_LOCKED_OBJECTS']; } ?>