Fixing installation process.

1.10.x
Julio Montoya 10 years ago
parent 7bcf75be41
commit 4cd805018f
  1. 5
      app/config/config.yml
  2. 3
      src/Chamilo/CoreBundle/Entity/UserField.php
  3. 3
      src/Chamilo/CoreBundle/Entity/UserFieldValues.php
  4. 2
      src/Chamilo/CoreBundle/Migrations/Schema/v2/Core.php
  5. 4
      src/Chamilo/InstallerBundle/Process/PhpExecutableFinder.php

@ -59,10 +59,9 @@ framework:
session:
# handler_id set to null will use default session handler from php.ini
handler_id: ~
fragments: ~
http_method_override: true
session:
cookie_lifetime: 1440
gc_probability: 0
fragments: ~
http_method_override: true
# Twig Configuration

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity;
@ -94,7 +95,7 @@ class UserField extends ExtraField
/**
* @var array
*
* @ORM\Column(name="configuration", type="text")
* @ORM\Column(name="configuration", type="array")
*/
protected $configuration = array();

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
namespace Chamilo\CoreBundle\Entity;
@ -37,7 +38,7 @@ class UserFieldValues extends ExtraFieldValues
protected $author;
/**
* @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", cascade={"persist"})
* @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", cascade={"persist"}, inversedBy="extraFields")
* @ORM\JoinColumn(name="user_id", referencedColumnName="id")
*/
protected $user;

@ -94,7 +94,7 @@ class Core implements Migration, OrderedMigrationInterface
$queries->addQuery("CREATE TABLE user_rel_user (id BIGINT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, friend_user_id INT NOT NULL, relation_type INT NOT NULL, last_edit DATETIME DEFAULT NULL, INDEX idx_user_rel_user__user (user_id), INDEX idx_user_rel_user__friend_user (friend_user_id), INDEX idx_user_rel_user__user_friend_user (user_id, friend_user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
$queries->addQuery("CREATE TABLE event_email_template (id INT AUTO_INCREMENT NOT NULL, message LONGTEXT DEFAULT NULL, subject VARCHAR(255) DEFAULT NULL, event_type_name VARCHAR(255) DEFAULT NULL, activated TINYINT(1) NOT NULL, language_id INT DEFAULT NULL, INDEX event_name_index (event_type_name), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
$queries->addQuery("CREATE TABLE language (id INT AUTO_INCREMENT NOT NULL, original_name VARCHAR(255) DEFAULT NULL, english_name VARCHAR(255) DEFAULT NULL, isocode VARCHAR(10) DEFAULT NULL, available TINYINT(1) NOT NULL, parent_id TINYINT(1) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
$queries->addQuery("CREATE TABLE user_field (id INT AUTO_INCREMENT NOT NULL, field_type INT NOT NULL, field_variable VARCHAR(64) NOT NULL, field_display_text VARCHAR(64) DEFAULT NULL, field_default_value LONGTEXT DEFAULT NULL, field_order INT DEFAULT NULL, field_visible TINYINT(1) DEFAULT NULL, field_changeable TINYINT(1) DEFAULT NULL, field_filter TINYINT(1) DEFAULT NULL, field_loggeable INT DEFAULT NULL, tms DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
$queries->addQuery("CREATE TABLE user_field (id INT AUTO_INCREMENT NOT NULL, field_type INT NOT NULL, field_variable VARCHAR(64) NOT NULL, field_display_text VARCHAR(64) DEFAULT NULL, field_default_value LONGTEXT DEFAULT NULL, field_order INT DEFAULT NULL, field_visible TINYINT(1) DEFAULT NULL, field_changeable TINYINT(1) DEFAULT NULL, field_filter TINYINT(1) DEFAULT NULL, field_loggeable INT DEFAULT NULL, tms DATETIME NOT NULL, configuration LONGTEXT DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
$queries->addQuery("CREATE TABLE user_field_audit (id INT NOT NULL, rev INT NOT NULL, field_type INT DEFAULT NULL, field_variable VARCHAR(64) DEFAULT NULL, field_display_text VARCHAR(64) DEFAULT NULL, field_default_value LONGTEXT DEFAULT NULL, field_order INT DEFAULT NULL, field_visible TINYINT(1) DEFAULT NULL, field_changeable TINYINT(1) DEFAULT NULL, field_filter TINYINT(1) DEFAULT NULL, field_loggeable INT DEFAULT NULL, tms DATETIME DEFAULT NULL, configuration LONGTEXT DEFAULT NULL, revtype VARCHAR(4) NOT NULL, PRIMARY KEY(id, rev)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
$queries->addQuery("CREATE TABLE track_stored_values_stack (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, sco_id INT NOT NULL, stack_order INT NOT NULL, course_id VARCHAR(40) NOT NULL, sv_key VARCHAR(64) NOT NULL, sv_value LONGTEXT NOT NULL, UNIQUE INDEX user_id_2 (user_id, sco_id, course_id, sv_key, stack_order), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");
$queries->addQuery("CREATE TABLE track_attempt_jury (id INT AUTO_INCREMENT NOT NULL, exe_id INT DEFAULT NULL, question_id INT DEFAULT NULL, score DOUBLE PRECISION DEFAULT NULL, jury_member_id INT DEFAULT NULL, question_score_name_id INT DEFAULT NULL, INDEX IDX_977B4A18B5A18F57 (exe_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB");

@ -9,7 +9,7 @@ class PhpExecutableFinder extends BasePhpExecutableFinder
/**
* {@inheritdoc}
*/
public function find()
public function find($includeArgs = true)
{
if ($php = getenv('CHAMILO_PHP_PATH')) {
if (is_executable($php)) {
@ -17,6 +17,6 @@ class PhpExecutableFinder extends BasePhpExecutableFinder
}
}
return parent::find();
return parent::find($includeArgs);
}
}

Loading…
Cancel
Save