TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Manuel Raynaud
2014-01-17 16:34:08 +01:00
parent d345069707 c41c957529
commit b7fc2fc0e5
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Model/Lang.php
View File

@@ -8,7 +8,7 @@ use Propel\Runtime\Propel;
use Thelia\Core\Event\Lang\LangEvent; use Thelia\Core\Event\Lang\LangEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Base\Lang as BaseLang; use Thelia\Model\Base\Lang as BaseLang;
use Thelia\Model\Base\LangQuery; use Thelia\Model\LangQuery;
use Thelia\Model\Map\LangTableMap; use Thelia\Model\Map\LangTableMap;
class Lang extends BaseLang { class Lang extends BaseLang {

24
reset_install.bat
View File

@@ -5,13 +5,20 @@ REM v0.1
echo [WARN] This script will reset this Thelia2 install echo [WARN] This script will reset this Thelia2 install
if exist local\config\database.yml ( if exist local\config\database.yml (
echo [INFO] Clearing caches
php Thelia cache:clear
echo [INFO] Self-updating Composer
composer self-update
echo [INFO] Downloading vendors echo [INFO] Downloading vendors
composer install --prefer-dist composer install --prefer-dist --optimize-autoloader
cd local\config\ cd local\config\
echo [INFO] Building Models file echo [INFO] Building Models file
..\..\bin\propel build -v --output-dir=../../core/lib/ ..\..\bin\propel build -v --output-dir=../../core/lib/ --enable-identifier-quoting
echo [INFO] Building SQL CREATE file echo [INFO] Building SQL CREATE file
..\..\bin\propel sql:build -v --output-dir=..\..\install ..\..\bin\propel sql:build -v --output-dir=..\..\install
@@ -25,8 +32,19 @@ if exist local\config\database.yml (
echo [INFO] Installing fixtures echo [INFO] Installing fixtures
php install\faker.php php install\faker.php
echo [INFO] Clearing caches
php Thelia cache:clear
echo [INFO] Adding admin echo [INFO] Adding admin
php Thelia admin:create php Thelia admin:create --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2
echo [INFO] Admin user thelia2 with password thelia2 successfully created.
echo [INFO] Activating Delivery Module(s)
php Thelia module:activate Colissimo
echo "[INFO] Activating Payment Module(s)"
php Thelia module:activate Cheque
echo [SUCCESS] Reset done echo [SUCCESS] Reset done
) )