diff --git a/backend/controllers/AdminMenuController.php b/backend/controllers/AdminMenuController.php index c8b6466..2e28a03 100644 --- a/backend/controllers/AdminMenuController.php +++ b/backend/controllers/AdminMenuController.php @@ -64,7 +64,7 @@ class AdminMenuController extends Controller { $model = new AdminMenu(); if ($model->load(Yii::$app->request->post()) && $model->save()) { - return $this->redirect(['view', 'id' => $model->id]); + return $this->redirect(['view', 'id' => $model->admin_menu_id]); } else { return $this->render('create', [ 'model' => $model, @@ -83,7 +83,7 @@ class AdminMenuController extends Controller $model = $this->findModel($id); if ($model->load(Yii::$app->request->post()) && $model->save()) { - return $this->redirect(['view', 'id' => $model->id]); + return $this->redirect(['view', 'id' => $model->adminmenu_id]); } else { return $this->render('update', [ 'model' => $model, diff --git a/backend/controllers/LanguageController.php b/backend/controllers/LanguageController.php index d75bea2..96f87e5 100644 --- a/backend/controllers/LanguageController.php +++ b/backend/controllers/LanguageController.php @@ -54,7 +54,7 @@ class LanguageController extends Controller { if(!empty(Yii::$app->request->get('id'))) { $model = $this->findModel(Yii::$app->request->get('id')); - $model->active = 1; + $model->status = 1; $model->save(); return $this->redirect(['index']); } else { @@ -77,7 +77,7 @@ class LanguageController extends Controller public function actionDelete($id) { $model = $this->findModel($id); - $model->active = 0; + $model->status = 0; $model->save(); return $this->redirect(['index']); @@ -152,18 +152,18 @@ class LanguageController extends Controller public function actionDeleteAdress($id) { $model = $this->findModelAdress($id); - $children = $model->hasMany(Option::className(), ['parent_id' => 'option_id'])->all(); + $children = $model->hasMany(Option::className(), ['option_pid' => 'option_id'])->all(); $langs = array(); if(!empty($children)) { foreach($children as $child) { - $langs = OptionLang::findAll(['id' => $child->option_id]); + $langs = OptionLang::findAll(['option_lang_id' => $child->option_id]); foreach($langs as $lang) { $lang->delete(); } $child->delete(); } } - $langs = OptionLang::findAll(['id' => $id]); + $langs = OptionLang::findAll(['option_lang_id' => $id]); foreach($langs as $lang) { $lang->delete(); } diff --git a/backend/models/AdminMenu.php b/backend/models/AdminMenu.php index 316afd3..2dd3ce1 100644 --- a/backend/models/AdminMenu.php +++ b/backend/models/AdminMenu.php @@ -7,14 +7,14 @@ use Yii; /** * This is the model class for table "admin_menu". * - * @property integer $id - * @property integer $parent_id - * @property integer $active + * @property integer $admin_menu_id + * @property integer $admin_menu_pid + * @property integer $status * @property integer $hide_min * @property integer $sort * @property string $name * @property string $path - * @property string $params + * @property string $param * * @property AdminMenu $parent * @property AdminMenu[] $adminMenus @@ -39,9 +39,9 @@ class AdminMenu extends \yii\db\ActiveRecord public function rules() { return [ - [['parent_id', 'active', 'hide_min', 'sort'], 'integer'], + [['admin_menu_pid', 'status', 'hide_min', 'sort'], 'integer'], [['name'], 'required'], - [['name', 'path', 'params','parentt'], 'string'] + [['name', 'path', 'param','parentt'], 'string'] ]; } @@ -51,14 +51,14 @@ class AdminMenu extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), - 'parent_id' => Yii::t('app', 'Parent ID'), - 'active' => Yii::t('app', 'Active'), + 'admin_menu_id' => Yii::t('app', 'Admin menu ID'), + 'admin_menu_pid' => Yii::t('app', 'Admin menu parent ID'), + 'status' => Yii::t('app', 'Status'), 'hide_min' => Yii::t('app', 'Hide Min'), 'sort' => Yii::t('app', 'Sort'), 'name' => Yii::t('app', 'Name'), 'path' => Yii::t('app', 'Path'), - 'params' => Yii::t('app', 'Params'), + 'param' => Yii::t('app', 'Params'), 'parentt' => Yii::t('app', 'Parent item') ]; } @@ -68,7 +68,7 @@ class AdminMenu extends \yii\db\ActiveRecord */ public function getParent() { - return $this->hasOne(AdminMenu::className(), ['id' => 'parent_id']); + return $this->hasOne(AdminMenu::className(), ['admin_menu_id' => 'admin_menu_pid']); } /** @@ -76,7 +76,7 @@ class AdminMenu extends \yii\db\ActiveRecord */ public function getAdminMenus() { - return $this->hasMany(AdminMenu::className(), ['parent_id' => 'id']); + return $this->hasMany(AdminMenu::className(), ['admin_menu_pid' => 'admin_menu_id']); } /** @@ -84,7 +84,7 @@ class AdminMenu extends \yii\db\ActiveRecord */ public function getAdminMenuAccessGroups() { - return $this->hasMany(AdminMenuAccessGroup::className(), ['menu_id' => 'id']); + return $this->hasMany(AdminMenuAccessGroup::className(), ['admin_menu_id' => 'admin_menu_id']); } /** @@ -92,26 +92,26 @@ class AdminMenu extends \yii\db\ActiveRecord */ public function getAdminMenuAccessUsers() { - return $this->hasMany(AdminMenuAccessUser::className(), ['menu_id' => 'id']); + return $this->hasMany(AdminMenuAccessUser::className(), ['admin_menu_id' => 'admin_menu_id']); } public static function buildMenu($withValues = false) { $result = []; - $roots = self::find()->where(['parent_id' => NULL])->with(['adminMenus'])->all(); + $roots = self::find()->where(['admin_menu_pid' => NULL])->with(['adminMenus'])->all(); foreach($roots as $root) { if($root->adminMenus) { - $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->id, 'options' => ['class' => 'header']]; + $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->admin_menu_id, 'options' => ['class' => 'header']]; foreach($root->adminMenus as $submenu) { if($submenu->adminMenus) { $items = []; foreach($submenu->adminMenus as $item) { - $items[] = ['label' => Yii::t('app', $item->name), 'id' => $item->id, 'icon' => 'fa fa-circle-o', 'url' => array_merge([$item->path], \common\models\Tools::parseUrlParams($item->params))]; + $items[] = ['label' => Yii::t('app', $item->name), 'id' => $item->admin_menu_id, 'icon' => 'fa fa-circle-o', 'url' => array_merge([$item->path], \common\models\Tools::parseUrlParams($item->param))]; } - $result[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->id, 'icon' => 'fa fa-circle-o', 'url' => '#', 'items' => $items]; + $result[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->admin_menu_id, 'icon' => 'fa fa-circle-o', 'url' => '#', 'items' => $items]; unset($items); } else { - $result[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->id, 'icon' => 'fa fa-circle-o', 'url' => array_merge([$submenu->path], \common\models\Tools::parseUrlParams($submenu->params))]; + $result[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->admin_menu_id, 'icon' => 'fa fa-circle-o', 'url' => array_merge([$submenu->path], \common\models\Tools::parseUrlParams($submenu->param))]; } } } @@ -122,17 +122,17 @@ class AdminMenu extends \yii\db\ActiveRecord public static function buildMenuSelect() { $result = []; - $roots = self::find()->where(['parent_id' => NULL])->with(['adminMenus'])->all(); + $roots = self::find()->where(['admin_menu_pid' => NULL])->with(['adminMenus'])->all(); foreach($roots as $root) { if($root->adminMenus) { $items = []; foreach($root->adminMenus as $submenu) { - $items[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->id]; + $items[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->admin_menu_id]; } - $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->id, 'items' => $items]; + $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->admin_menu_id, 'items' => $items]; unset($items); } else { - $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->id]; + $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->admin_menu_id]; } } return $result; @@ -141,8 +141,8 @@ class AdminMenu extends \yii\db\ActiveRecord public function beforeSave($insert) { if (parent::beforeSave($insert)) { - if(!$this->parent_id) { - $this->parent_id = NULL; + if(!$this->admin_menu_pid) { + $this->admin_menu_pid = NULL; } return true; } else { diff --git a/backend/models/AdminMenuAccessGroup.php b/backend/models/AdminMenuAccessGroup.php index 8bf3c60..5b6a266 100644 --- a/backend/models/AdminMenuAccessGroup.php +++ b/backend/models/AdminMenuAccessGroup.php @@ -7,8 +7,8 @@ use Yii; /** * This is the model class for table "admin_menu_access_group". * - * @property integer $id - * @property integer $menu_id + * @property integer $admin_menu_access_group_id + * @property integer $admin_menu_id * @property string $group * * @property AdminMenu $menu @@ -30,7 +30,7 @@ class AdminMenuAccessGroup extends \yii\db\ActiveRecord public function rules() { return [ - [['menu_id'], 'integer'], + [['admin_menu_id'], 'integer'], [['group'], 'string'] ]; } @@ -41,8 +41,8 @@ class AdminMenuAccessGroup extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), - 'menu_id' => Yii::t('app', 'Menu ID'), + 'admin_menu_access_group_id' => Yii::t('app', 'Admin Access Group ID'), + 'admin_menu_id' => Yii::t('app', 'Admin Menu ID'), 'group' => Yii::t('app', 'Group'), ]; } @@ -52,7 +52,7 @@ class AdminMenuAccessGroup extends \yii\db\ActiveRecord */ public function getMenu() { - return $this->hasOne(AdminMenu::className(), ['id' => 'menu_id']); + return $this->hasOne(AdminMenu::className(), ['admin_menu_id' => 'admin_menu_id']); } /** diff --git a/backend/models/AdminMenuAccessUser.php b/backend/models/AdminMenuAccessUser.php index cc3a797..94a0833 100644 --- a/backend/models/AdminMenuAccessUser.php +++ b/backend/models/AdminMenuAccessUser.php @@ -2,14 +2,15 @@ namespace backend\models; +use common\models\User; use Yii; /** * This is the model class for table "admin_menu_access_user". * - * @property integer $menu_id + * @property integer $admin_menu_id * @property integer $user_id - * @property integer $id + * @property integer $admin_menu_access_user_id * * @property AdminMenu $menu * @property User $user @@ -30,7 +31,7 @@ class AdminMenuAccessUser extends \yii\db\ActiveRecord public function rules() { return [ - [['menu_id', 'user_id'], 'integer'] + [['admin_menu_id', 'user_id'], 'integer'] ]; } @@ -40,9 +41,9 @@ class AdminMenuAccessUser extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'menu_id' => Yii::t('app', 'Menu ID'), + 'admin_menu_id' => Yii::t('app', 'Admin Menu ID'), 'user_id' => Yii::t('app', 'User ID'), - 'id' => Yii::t('app', 'ID'), + 'admin_menu_access_user_id' => Yii::t('app', 'Admin Menu Access User ID'), ]; } @@ -51,7 +52,7 @@ class AdminMenuAccessUser extends \yii\db\ActiveRecord */ public function getMenu() { - return $this->hasOne(AdminMenu::className(), ['id' => 'menu_id']); + return $this->hasOne(AdminMenu::className(), ['admin_menu_id' => 'admin_menu_id']); } /** diff --git a/backend/models/AdminMenuSearch.php b/backend/models/AdminMenuSearch.php index 534efda..0ad3652 100644 --- a/backend/models/AdminMenuSearch.php +++ b/backend/models/AdminMenuSearch.php @@ -20,8 +20,8 @@ class AdminMenuSearch extends AdminMenu public function rules() { return [ - [['id', 'parent_id', 'active', 'hide_min', 'sort'], 'integer'], - [['name', 'path', 'params','parentt'], 'safe'], + [['admin_menu_id', 'admin_menu_pid', 'status', 'hide_min', 'sort'], 'integer'], + [['name', 'path', 'param','parentt'], 'safe'], ]; } @@ -52,11 +52,11 @@ class AdminMenuSearch extends AdminMenu ], 'sort' => [ 'attributes' => [ - 'id', + 'admin_menu_id', 'name', 'path', - 'params', - 'active', + 'param', + 'status', 'hide_min', 'parentt' => [ 'asc' => ['name' => SORT_ASC], @@ -76,9 +76,9 @@ class AdminMenuSearch extends AdminMenu } $query->andFilterWhere([ - 'id' => $this->id, - 'parent_id' => $this->parent_id, - 'active' => $this->active, + 'admin_menu_id' => $this->admin_menu_id, + 'admin_menu_pid' => $this->admin_menu_pid, + 'status' => $this->status, 'hide_min' => $this->hide_min, 'sort' => $this->sort ]); @@ -86,8 +86,8 @@ class AdminMenuSearch extends AdminMenu $query->andFilterWhere(['like', 'name', $this->name]) ->andFilterWhere(['like', 'path', $this->path]) - ->andFilterWhere(['like', 'params', $this->params]) - ->andFilterWhere(['in', 'parent_id', $this->find()->select(['id'])->andFilterWhere(['like', 'name', $this->parentt])->column()]); + ->andFilterWhere(['like', 'param', $this->param]) + ->andFilterWhere(['in', 'admin_menu_pid', $this->find()->select(['admin_menu_id'])->andFilterWhere(['like', 'name', $this->parentt])->column()]); return $dataProvider; } diff --git a/backend/models/LanguageSearch.php b/backend/models/LanguageSearch.php index 9c52df7..3a1610e 100644 --- a/backend/models/LanguageSearch.php +++ b/backend/models/LanguageSearch.php @@ -19,8 +19,8 @@ class LanguageSearch extends Language { return [ [['language_id'], 'integer'], - [['lang_code', 'language_name'], 'safe'], - [['is_default', 'active'], 'boolean'], + [['language_code', 'language_name'], 'safe'], + [['is_default', 'status'], 'boolean'], ]; } @@ -59,12 +59,12 @@ class LanguageSearch extends Language $query->andFilterWhere([ 'language_id' => $this->language_id, 'is_default' => $this->is_default, - 'active' => $this->active, + 'status' => $this->status, ]); - $query->andFilterWhere(['like', 'lang_code', $this->lang_code]) + $query->andFilterWhere(['like', 'language_code', $this->language_code]) ->andFilterWhere(['like', 'language_name', $this->language_name]) - ->andWhere(['active' => '1']) + ->andWhere(['status' => '1']) ->andWhere(['>', 'language_id', '0']); return $dataProvider; @@ -89,12 +89,12 @@ class LanguageSearch extends Language $query->andFilterWhere([ 'language_id' => $this->language_id, 'is_default' => $this->is_default, - 'active' => $this->active, + 'status' => $this->status, ]); - $query->andFilterWhere(['like', 'lang_code', $this->lang_code]) + $query->andFilterWhere(['like', 'language_code', $this->language_code]) ->andFilterWhere(['like', 'language_name', $this->language_name]) - ->andWhere(['active' => '0']); + ->andWhere(['status' => '0']); return $dataProvider; } diff --git a/backend/views/admin-menu/_form.php b/backend/views/admin-menu/_form.php index 8bfa3fa..21c33c0 100644 --- a/backend/views/admin-menu/_form.php +++ b/backend/views/admin-menu/_form.php @@ -16,13 +16,13 @@ use yii\widgets\ActiveForm; field($model, 'name')->textInput() ?> - field($model, 'active')->checkbox() ?> + field($model, 'status')->checkbox() ?> field($model, 'hide_min')->checkbox() ?> field($model, 'path')->textInput() ?> - field($model, 'params')->textInput() ?> + field($model, 'param')->textInput() ?>
@@ -37,12 +37,12 @@ use yii\widgets\ActiveForm;
", 'columns' => [ ['class' => 'yii\grid\ActionColumn'], - 'id', + 'admin_menu_id', 'name', 'path', - 'params', + 'param', [ 'format' => 'raw', 'filter' => [ @@ -50,20 +50,20 @@ $this->params['breadcrumbs'][] = $this->title; '0'=>'Скрытые', ], 'value' => function($data){ - if($data->active){ + if($data->status){ $status_img = ''; } else { $status_img = ''; } return $status_img; }, - 'attribute'=>'active', + 'attribute'=>'status', ], [ 'attribute' => 'parentt', 'content' => function($model, $key, $index, $column) { - if($model->parent->id) { + if($model->parent->admin_menu_id) { return $model->parent->name; } else { return ''.Yii::t('app', 'Корневой элемент').''; diff --git a/backend/views/admin-menu/update.php b/backend/views/admin-menu/update.php index bf18d47..b2aa38c 100644 --- a/backend/views/admin-menu/update.php +++ b/backend/views/admin-menu/update.php @@ -7,7 +7,7 @@ use yii\helpers\Html; $this->title = Yii::t('app', 'Update') . ': ' . $model->name; $this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Admin Menus'), 'url' => ['index']]; -$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]]; +$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->admin_menu_id]]; $this->params['breadcrumbs'][] = Yii::t('app', 'Update'); ?>
diff --git a/backend/views/language/index.php b/backend/views/language/index.php index ad62ba2..ebd2c98 100644 --- a/backend/views/language/index.php +++ b/backend/views/language/index.php @@ -28,7 +28,7 @@ echo $this->render('layout'); } ], 'language_name', - 'lang_code', + 'language_code', 'is_default:boolean', [ 'class' => 'yii\grid\ActionColumn', diff --git a/backend/web/js/option.js b/backend/web/js/option.js index a585b51..a71b24d 100644 --- a/backend/web/js/option.js +++ b/backend/web/js/option.js @@ -14,7 +14,6 @@ function readURL(input) { } function checkboxerInit() { $.each($('.checkboxer input[type=radio]:checked'), function(index, value) { - console.log(value); $(value).trigger('change'); }); } @@ -64,7 +63,31 @@ $(function() { $(value).find('li').append(''); } }); - $(document).on('click', '.dropdown-menu.f32 li a[data-lang]', function() { + $(document).on('click', '.dropdown-menu.f32:not(.old) li a[data-lang]', function() { + var lang = $(this).data('lang'); + var flag = $(this).find('span').first().clone(); + var el = $(this); + var id = $(this).attr('href').substr(1); + var path = form[id].handler; + var view = form[id].view; + var model = form[id].model; + $.get(path, { lang_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) { + $('#'+id+'-tabs li').removeClass('active'); + $('#'+id+'-tabs').append('
  • '+$('

    ').append($(flag)).html()+'

    • '); + $('#tab-content-'+id+' .tab-pane.active').removeClass('active'); + $('#tab-content-'+id).append($(data).find('.ajax-loaded').first()); + $('body').append($(data).filter('script')); + $(el).parent().remove(); + if(!$('#lang-'+id+' li').length) { + $('#'+id+'Lang').addClass('disabled'); + } + if($('#'+id+'-tabs li').length > 1) { + $('#'+id+'-tabs li').append('') + } + }); + }); + $(document).on('click', '.dropdown-menu.f32.old li a[data-lang]', function(e) { + e.preventDefault(); var lang = $(this).data('lang'); var flag = $(this).find('span').first().clone(); var el = $(this); @@ -100,9 +123,11 @@ $(function() { } }); $(document).on('change', '.checkboxer .checkboxer_label input[type=radio]', function() { - console.log($(this).val()); $(this).parents('.checkboxer').find('.checkboxer_container').removeClass('active'); $(this).parents('.checkboxer_container').addClass('active'); }); + $.each($('.f32'), function(i, val) { + $(val).find('a[role=tab]').first().trigger('click'); + }); checkboxerInit(); }); \ No newline at end of file diff --git a/common/components/LangRequest.php b/common/components/LangRequest.php index 6aece05..9b5ab3f 100644 --- a/common/components/LangRequest.php +++ b/common/components/LangRequest.php @@ -3,6 +3,7 @@ namespace common\components; use Yii; +use yii\base\InvalidConfigException; use yii\web\Request; use common\models\Language; use common\models\Page; @@ -29,10 +30,10 @@ class LangRequest extends Request Language::setCurrent($lang_url); - if ($lang_url !== null && $lang_url === Language::getCurrent()->lang_code - && strpos($this->_lang_url, Language::getCurrent()->lang_code) === 1) + if ($lang_url !== null && $lang_url === Language::getCurrent()->language_code + && strpos($this->_lang_url, Language::getCurrent()->language_code) === 1) { - $this->_lang_url = substr ($this->_lang_url, strlen (Language::getCurrent()->lang_code) + 1); + $this->_lang_url = substr ($this->_lang_url, strlen (Language::getCurrent()->language_code) + 1); } } diff --git a/common/models/Language.php b/common/models/Language.php index e6c826a..4a98949 100644 --- a/common/models/Language.php +++ b/common/models/Language.php @@ -8,7 +8,11 @@ use Yii; * This is the model class for table "language". * * @property integer $language_id - * @property string $lang_code + * @property string $language_code + * @property string $is_default + * @property string $language_name + * @property string $status + * @property string $country_code */ class Language extends \yii\db\ActiveRecord { @@ -32,8 +36,8 @@ class Language extends \yii\db\ActiveRecord $language = self::getLangByUrl($lang_code); self::$current = ($language === null) ? self::getDefaultLang() : $language; // задаем - Yii::$app->language = self::$current->lang_code; - Yii::$app->params['lang_id'] = self::$current->language_id; + Yii::$app->language = self::$current->language_code; + Yii::$app->params['language_id'] = self::$current->language_id; } //Получения объекта языка по умолчанию @@ -48,7 +52,7 @@ class Language extends \yii\db\ActiveRecord if ($lang_code === null) { return null; } else { - $language = Language::find()->where('lang_code = :what', [':what' => $lang_code])->one(); + $language = Language::find()->where('language_code = :what', [':what' => $lang_code])->one(); return $language === null ? null : $language; } } @@ -67,8 +71,8 @@ class Language extends \yii\db\ActiveRecord public function rules() { return [ - [['lang_code'], 'required'], - [['lang_code'], 'string', 'max' => 4] + [['language_code', 'language_name', 'country_code'], 'required'], + [['language_code', 'country_code'], 'string', 'max' => 4] ]; } @@ -79,13 +83,17 @@ class Language extends \yii\db\ActiveRecord { return [ 'language_id' => Yii::t('app/Lang', 'Language ID'), - 'lang_code' => Yii::t('app/Lang', 'Lang Code'), + 'language_code' => Yii::t('app/Lang', 'Lang Code'), + 'is_default' => Yii::t('app/Lang', 'Default lang'), + 'language_name' => Yii::t('app/Lang', 'Language Name'), + 'status' => Yii::t('app/Lang', 'Language Status'), + 'country_code' => Yii::t('app/Lang', 'Country Code'), ]; } public static function getActiveLanguages() { - return Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1])->orderBy('is_default DESC')->indexBy('language_id')->all(); + return Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1])->orderBy('is_default DESC')->indexBy('language_id')->all(); } } diff --git a/common/models/Media.php b/common/models/Media.php index 6860c0d..d66805b 100644 --- a/common/models/Media.php +++ b/common/models/Media.php @@ -12,8 +12,9 @@ use yii\web\UploadedFile; /** * This is the model class for table "media". * - * @property integer $id + * @property integer $media_id * @property string $hash + * @property string $extension * * @property ArticleCategoryMedia[] $articleCategoryMedia * @property ArticleMedia[] $articleMedia @@ -39,8 +40,8 @@ class Media extends ActiveRecord public function rules() { return [ - [['id'], 'integer'], - [['hash'], 'string'], + [['media_id'], 'integer'], + [['hash', 'extension'], 'string'], [['imageFile'], 'file', 'extensions' => 'png, gif, jpeg, jpg', 'skipOnEmpty' => true], ]; } @@ -51,8 +52,9 @@ class Media extends ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), + 'media_id' => Yii::t('app', 'ID'), 'hash' => Yii::t('app', 'Hash'), + 'extension' => Yii::t('app', 'Extension'), ]; } @@ -61,7 +63,7 @@ class Media extends ActiveRecord */ public function getArticleCategoryMedia() { - return $this->hasMany(ArticleCategoryMedia::className(), ['media_id' => 'id']); + return $this->hasMany(ArticleCategoryMedia::className(), ['media_id' => 'media_id']); } /** @@ -69,12 +71,12 @@ class Media extends ActiveRecord */ public function getArticleMedia() { - return $this->hasMany(ArticleMedia::className(), ['media_id' => 'id']); + return $this->hasMany(ArticleMedia::className(), ['media_id' => 'media_id']); } public function getArticle() { - return $this->hasMany(Article::className(), ['id' => 'article_id'])->via('articleMedia'); + return $this->hasMany(Article::className(), ['article_id' => 'article_id'])->via('articleMedia'); } public function upload() diff --git a/common/modules/blog/controllers/AjaxController.php b/common/modules/blog/controllers/AjaxController.php index c906621..6ff8ba6 100644 --- a/common/modules/blog/controllers/AjaxController.php +++ b/common/modules/blog/controllers/AjaxController.php @@ -29,7 +29,7 @@ class AjaxController extends Controller public function actionCategoryForm($lang_id, $widget_id) { - $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one(); + $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one(); if(!$model) { throw new NotFoundHttpException('Language not found'); } @@ -39,7 +39,7 @@ class AjaxController extends Controller public function actionArticleForm($lang_id, $widget_id) { - $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one(); + $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one(); if(!$model) { throw new NotFoundHttpException('Language not found'); } @@ -49,7 +49,7 @@ class AjaxController extends Controller public function actionArticleMediaForm($lang_id, $widget_id, $type) { - $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one(); + $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one(); if(!$model) { throw new NotFoundHttpException('Language not found'); } @@ -62,7 +62,7 @@ class AjaxController extends Controller public function actionArticleCategoryMediaForm($lang_id, $widget_id, $type) { - $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one(); + $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $lang_id])->one(); if(!$model) { throw new NotFoundHttpException('Language not found'); } @@ -123,4 +123,10 @@ class AjaxController extends Controller return false; } } + + public function actionMultilangForm($model, $ajaxView, $widget_id, $lang_id = NULL) + { + $model = new $model(['language_id' => $lang_id]); + return $this->renderAjax($ajaxView, ['model' => $model, 'widget_id' => $widget_id]); + } } diff --git a/common/modules/blog/controllers/ArticleController.php b/common/modules/blog/controllers/ArticleController.php index 38ee671..9550612 100644 --- a/common/modules/blog/controllers/ArticleController.php +++ b/common/modules/blog/controllers/ArticleController.php @@ -39,18 +39,18 @@ class ArticleController extends Controller if(!empty(\Yii::$app->request->post())) { $isValid = true; $article->load(\Yii::$app->request->post()); - $article->author = \Yii::$app->user->getId(); + $article->user_id = \Yii::$app->user->getId(); $isValid = $article->validate(); foreach(\Yii::$app->request->post()['ArticleMedia'] as $lang => $value) { foreach($value as $type => $fields) { $images[$lang][$type] = new ArticleMedia(['scenario' => $type]); $images[$lang][$type]->type = $type; - $images[$lang][$type]->lang_id = $lang; + $images[$lang][$type]->language_id = $lang; $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile"); $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid; } } - $images[0]['additional']->lang_id = 0; + $images[0]['additional']->language_id = 0; $images[0]['additional']->type = 'additional'; $images[0]['additional']->imageFile = UploadedFile::getInstances($images[0]['additional'], "[0][additional]imageFile"); if(empty(\Yii::$app->request->post()['ArticleLang'])) { @@ -72,20 +72,20 @@ class ArticleController extends Controller if(!empty($article_categories)) { foreach($article_categories as $article_category) { $articletocategory[$article_category] = new ArticleToCategory(); - $articletocategory[$article_category]->category_id = $article_category; + $articletocategory[$article_category]->article_category_id = $article_category; $articletocategory[$article_category]->link('article', $article); } } $first = 1; foreach($images as $lang => $value) { foreach($value as $type => $fields) { - $images[$lang][$type]->upload($article->id); + $images[$lang][$type]->upload($article->article_id); if($first && $type != 'additional') { $media_clone = clone $images[$lang][$type]; $media_clone->setIsNewRecord(true); - unset($media_clone->id); - $media_clone->lang_id = 0; - $media_clone->upload($article->id); + unset($media_clone->article_media_id); + $media_clone->language_id = 0; + $media_clone->upload($article->article_id); unset($media_clone); $first = 0; } @@ -95,7 +95,7 @@ class ArticleController extends Controller foreach($article_langs as $article_lang) { if($first) { $article_lang_clone = clone $article_lang; - $article_lang_clone->lang_id = 0; + $article_lang_clone->language_id = 0; $article_lang_clone->link('article', $article); unset($article_lang_clone); } @@ -121,45 +121,45 @@ class ArticleController extends Controller $images = []; $images[0]['additional'][0] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_ADDITIONAL]); $images[0]['additional'][0]->type = 'additional'; - $images[0]['additional'][0]->lang_id = 0; + $images[0]['additional'][0]->language_id = 0; foreach($imagestack as $image) { if(in_array($image->type, ['full', 'preview'])) { - $images[$image->lang_id][$image->type] = $image; - $images[$image->lang_id][$image->type]->scenario = $image->type; + $images[$image->language_id][$image->type] = $image; + $images[$image->language_id][$image->type]->scenario = $image->type; } else { - $images[$image->lang_id][$image->type][$image->id] = $image; - $images[$image->lang_id][$image->type][$image->id]->scenario = $image->type; + $images[$image->language_id][$image->type][$image->article_media_id] = $image; + $images[$image->language_id][$image->type][$image->article_media_id]->scenario = $image->type; } } foreach($images as $lang => $value) { $images[$lang]['additional'][0] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_ADDITIONAL]); } - $article_langs = $article->getArticleLangs()->where(['>=', 'lang_id', '1'])->indexBy('lang_id')->all(); + $article_langs = $article->getArticleLangs()->where(['>=', 'language_id', '1'])->indexBy('language_id')->all(); $langs = Language::getActiveLanguages(); $default_lang = Language::getDefaultLang(); $isValid = false; if(!empty(\Yii::$app->request->post())) { $isValid = true; $article->load(\Yii::$app->request->post()); - ArticleToCategory::deleteAll(['article_id' => $article->id]); + ArticleToCategory::deleteAll(['article_id' => $article->article_id]); $article_categories = \Yii::$app->request->post('Article')['articleCategoriesArray']; if(!empty($article_categories)) { foreach($article_categories as $article_category) { $articletocategory[$article_category] = new ArticleToCategory(); - $articletocategory[$article_category]->category_id = $article_category; + $articletocategory[$article_category]->article_category_id = $article_category; $articletocategory[$article_category]->link('article', $article); } } $isValid = $article->validate(); $images[0]['additional'][0]->type = 'additional'; - $images[0]['additional'][0]->lang_id = 0; + $images[0]['additional'][0]->language_id = 0; $images[0]['additional'][0]->imageFile = UploadedFile::getInstances($images[0]['additional'][0], "[0][additional]imageFile"); $isValid = $images[0]['additional'][0]->validate(['imageFile']) && $isValid; foreach(\Yii::$app->request->post()['ArticleMedia'] as $lang => $value) { foreach($value as $type => $fields) { if(!in_array($type, ['full', 'preview'])) continue; $images[$lang][$type] = new ArticleMedia(['scenario' => $type]); - $images[$lang][$type]->lang_id = $lang; + $images[$lang][$type]->language_id = $lang; $images[$lang][$type]->type = $type; $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile"); $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid; @@ -171,7 +171,7 @@ class ArticleController extends Controller foreach(\Yii::$app->request->post()['ArticleLang'] as $index => $article_lang) { if (!array_key_exists($index, $article_langs)) { $article_langs[$index] = new ArticleLang(); - $article_langs[$index]->article_id = $article->id; + $article_langs[$index]->article_id = $article->article_id; } } ArticleLang::loadMultiple($article_langs, \Yii::$app->request->post()); @@ -186,7 +186,7 @@ class ArticleController extends Controller $images[$lang][$type][0]->upload($article->id); } else { if(!empty($images[$lang][$type]->imageFile)) { - $images[$lang][$type]->replace($article->id); + $images[$lang][$type]->replace($article->article_id); } } } diff --git a/common/modules/blog/controllers/CategoryController.php b/common/modules/blog/controllers/CategoryController.php index eeff9b2..7759416 100644 --- a/common/modules/blog/controllers/CategoryController.php +++ b/common/modules/blog/controllers/CategoryController.php @@ -58,12 +58,12 @@ class CategoryController extends Controller foreach($value as $type => $fields) { $images[$lang][$type] = new ArticleCategoryMedia(['scenario' => $type]); $images[$lang][$type]->type = $type; - $images[$lang][$type]->lang_id = $lang; + $images[$lang][$type]->language_id = $lang; $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile"); $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid; } } - $images[0]['additional']->lang_id = 0; + $images[0]['additional']->language_id = 0; $images[0]['additional']->type = 'additional'; $images[0]['additional']->imageFile = UploadedFile::getInstances($images[0]['additional'], "[0][additional]imageFile"); if(empty(\Yii::$app->request->post()['ArticleCategoryLang'])) { @@ -84,13 +84,13 @@ class CategoryController extends Controller $first = 1; foreach($images as $lang => $value) { foreach($value as $type => $fields) { - $images[$lang][$type]->upload($category->id); + $images[$lang][$type]->upload($category->article_category_id); if($first && $type != 'additional') { $media_clone = clone $images[$lang][$type]; $media_clone->setIsNewRecord(true); - unset($media_clone->id); - $media_clone->lang_id = 0; - $media_clone->upload($category->id); + unset($media_clone->article_category_media_id); + $media_clone->language_id = 0; + $media_clone->upload($category->article_category_id); unset($media_clone); $first = 0; } @@ -100,7 +100,7 @@ class CategoryController extends Controller foreach($category_langs as $category_lang) { if($first) { $category_lang_clone = clone $category_lang; - $category_lang_clone->lang_id = 0; + $category_lang_clone->language_id = 0; $category_lang_clone->link('category', $category); unset($category_lang_clone); } @@ -126,20 +126,20 @@ class CategoryController extends Controller $images = []; $images[0]['additional'][0] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_ADDITIONAL]); $images[0]['additional'][0]->type = 'additional'; - $images[0]['additional'][0]->lang_id = 0; + $images[0]['additional'][0]->language_id = 0; foreach($imagestack as $image) { if(in_array($image->type, ['full', 'preview'])) { - $images[$image->lang_id][$image->type] = $image; - $images[$image->lang_id][$image->type]->scenario = $image->type; + $images[$image->language_id][$image->type] = $image; + $images[$image->language_id][$image->type]->scenario = $image->type; } else { - $images[$image->lang_id][$image->type][$image->id] = $image; - $images[$image->lang_id][$image->type][$image->id]->scenario = $image->type; + $images[$image->language_id][$image->type][$image->article_category_media_id] = $image; + $images[$image->language_id][$image->type][$image->article_category_media_id]->scenario = $image->type; } } foreach($images as $lang => $value) { $images[$lang]['additional'][0] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_ADDITIONAL]); } - $category_langs = $category->getArticleCategoryLangs()->where(['>=', 'lang_id', '1'])->indexBy('lang_id')->all(); + $category_langs = $category->getArticleCategoryLangs()->where(['>=', 'language_id', '1'])->indexBy('language_id')->all(); $langs = Language::getActiveLanguages(); $default_lang = Language::getDefaultLang(); $isValid = false; @@ -148,14 +148,14 @@ class CategoryController extends Controller $category->load(\Yii::$app->request->post()); $isValid = $category->validate(); $images[0]['additional'][0]->type = 'additional'; - $images[0]['additional'][0]->lang_id = 0; + $images[0]['additional'][0]->language_id = 0; $images[0]['additional'][0]->imageFile = UploadedFile::getInstances($images[0]['additional'][0], "[0][additional]imageFile"); $isValid = $images[0]['additional'][0]->validate(['imageFile']) && $isValid; foreach(\Yii::$app->request->post()['ArticleCategoryMedia'] as $lang => $value) { foreach($value as $type => $fields) { if(!in_array($type, ['full', 'preview'])) continue; $images[$lang][$type] = new ArticleCategoryMedia(['scenario' => $type]); - $images[$lang][$type]->lang_id = $lang; + $images[$lang][$type]->language_id = $lang; $images[$lang][$type]->type = $type; $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile"); $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid; @@ -167,7 +167,7 @@ class CategoryController extends Controller foreach(\Yii::$app->request->post()['ArticleCategoryLang'] as $index => $category_lang) { if(!array_key_exists($index, $category_langs)) { $category_langs[$index] = new ArticleCategoryLang(); - $category_langs[$index]->category_id = $category->id; + $category_langs[$index]->article_category_id = $category->article_category_id; } } ArticleCategoryLang::loadMultiple($category_langs, \Yii::$app->request->post()); @@ -179,10 +179,10 @@ class CategoryController extends Controller foreach($images as $lang => $value) { foreach($value as $type => $fields) { if($type == 'additional') { - $images[$lang][$type][0]->upload($category->id); + $images[$lang][$type][0]->upload($category->article_category_id); } else { if(!empty($images[$lang][$type]->imageFile)) { - $images[$lang][$type]->replace($category->id); + $images[$lang][$type]->replace($category->article_category_id); } } } diff --git a/common/modules/blog/models/Article.php b/common/modules/blog/models/Article.php index b9bd15e..ea992ff 100644 --- a/common/modules/blog/models/Article.php +++ b/common/modules/blog/models/Article.php @@ -11,21 +11,21 @@ use yii\db\Query; /** * This is the model class for table "article". * - * @property integer $id + * @property integer $article_id * @property integer $sort - * @property string $create_at - * @property string $update_at + * @property string $date_add + * @property string $date_update * @property string $code - * @property integer $author - * @property string $tags - * @property integer $parent_id - * @property integer $active - * @property integer $comments - * @property integer $voting + * @property integer $user_id + * @property string $tag + * @property integer $article_pid + * @property integer $status + * @property integer $comment + * @property integer $vote * * @property Article $parent * @property Article[] $articles - * @property User $author0 + * @property User $user * @property ArticleLang[] $articleLangs * @property ArticleMedia[] $articleMedia * @property ArticleToCategory[] $articleToCategories @@ -58,10 +58,10 @@ class Article extends \yii\db\ActiveRecord public function rules() { return [ - [['sort', 'parent_id', 'active', 'comments', 'voting'], 'integer'], - [['create_at', 'update_at'], 'safe'], + [['sort', 'article_pid', 'status', 'comment', 'vote'], 'integer'], + [['date_add', 'date_update'], 'safe'], [['code'], 'required'], - [['code', 'tags'], 'string'] + [['code', 'tag'], 'string'] ]; } @@ -71,17 +71,17 @@ class Article extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), + 'article_id' => Yii::t('app', 'ID'), 'sort' => Yii::t('app', 'Sort'), - 'create_at' => Yii::t('app', 'Create At'), - 'update_at' => Yii::t('app', 'Update At'), + 'date_add' => Yii::t('app', 'Create At'), + 'date_update' => Yii::t('app', 'Update At'), 'code' => Yii::t('app', 'Code'), - 'author' => Yii::t('app', 'Author'), - 'tags' => Yii::t('app', 'Tags'), - 'parent_id' => Yii::t('app', 'Parent ID'), - 'active' => Yii::t('app', 'Active'), - 'comments' => Yii::t('app', 'Comments'), - 'voting' => Yii::t('app', 'Voting'), + 'user_id' => Yii::t('app', 'Author'), + 'tag' => Yii::t('app', 'Tags'), + 'article_pid' => Yii::t('app', 'Parent ID'), + 'status' => Yii::t('app', 'Active'), + 'comment' => Yii::t('app', 'Comments'), + 'vote' => Yii::t('app', 'Voting'), ]; } @@ -90,7 +90,7 @@ class Article extends \yii\db\ActiveRecord */ public function getParent() { - return $this->hasOne(Article::className(), ['id' => 'parent_id']); + return $this->hasOne(Article::className(), ['article_id' => 'article_pid']); } /** @@ -98,15 +98,15 @@ class Article extends \yii\db\ActiveRecord */ public function getArticles() { - return $this->hasMany(Article::className(), ['parent_id' => 'id']); + return $this->hasMany(Article::className(), ['article_pid' => 'article_id']); } /** * @return \yii\db\ActiveQuery */ - public function getAuthor0() + public function getUser() { - return $this->hasOne(User::className(), ['id' => 'author']); + return $this->hasOne(User::className(), ['id' => 'user_id']); } /** @@ -114,7 +114,7 @@ class Article extends \yii\db\ActiveRecord */ public function getArticleLangs() { - return $this->hasMany(ArticleLang::className(), ['article_id' => 'id']); + return $this->hasMany(ArticleLang::className(), ['article_id' => 'article_id']); } /** @@ -122,40 +122,40 @@ class Article extends \yii\db\ActiveRecord */ public function getArticleMedia() { - return $this->hasMany(ArticleMedia::className(), ['article_id' => 'id']); + return $this->hasMany(ArticleMedia::className(), ['article_id' => 'article_id']); } public function getMedia() { - return $this->hasMany(Media::className(), ['id' => 'media_id'])->via('articleMedia'); + return $this->hasMany(Media::className(), ['article_id' => 'media_id'])->via('articleMedia'); } /** * @return \yii\db\ActiveQuery */ public function getArticleToCategories() { - return $this->hasMany(ArticleToCategory::className(), ['article_id' => 'id']); + return $this->hasMany(ArticleToCategory::className(), ['article_id' => 'article_id']); } public function getArticleCategories() { - return $this->hasMany(ArticleCategory::className(), ['id' => 'category_id'])->viaTable('article_to_category', ['article_id' => 'id']); + return $this->hasMany(ArticleCategory::className(), ['article_category_id' => 'article_category_id'])->viaTable('article_to_category', ['article_id' => 'article_category_id']); } public static function findArticleDropdown($id) { $query = new Query(); - return $query->select(['l.name', 'a.id']) + return $query->select(['l.name', 'a.article_id']) ->from(['article a']) - ->leftJoin(['article_lang l'], 'a.id = l.article_id') - ->where(['l.lang_id' => 0, 'a.active' => 1]) - ->andWhere(['not', ['a.id' => $id]]) - ->indexBy('a.id') + ->leftJoin(['article_lang l'], 'a.article_id = l.article_id') + ->where(['l.language_id' => 0, 'a.status' => 1]) + ->andWhere(['not', ['a.article_id' => $id]]) + ->indexBy('article_id') ->column(); } public function getArticleCategoriesArray() { - return $this->getArticleToCategories()->select('category_id')->column(); + return $this->getArticleToCategories()->select('article_category_id')->column(); } } diff --git a/common/modules/blog/models/ArticleCategory.php b/common/modules/blog/models/ArticleCategory.php index 6fd39e9..f91721f 100644 --- a/common/modules/blog/models/ArticleCategory.php +++ b/common/modules/blog/models/ArticleCategory.php @@ -11,14 +11,14 @@ use yii\db\Query; /** * This is the model class for table "article_category". * - * @property integer $id - * @property integer $active + * @property integer $article_category_id + * @property integer $status * @property integer $sort * @property string $code - * @property string $created_at - * @property string $updated_at - * @property string $tags - * @property integer $parent_id + * @property string $date_add + * @property string $date_update + * @property string $tag + * @property integer $artucle_category_pid * * @property Article[] $articles * @property ArticleCategory $parent @@ -53,11 +53,11 @@ class ArticleCategory extends ActiveRecord public function rules() { return [ - [['active', 'sort', 'parent_id'], 'integer'], + [['status', 'sort', 'article_category_pid'], 'integer'], [['code'], 'required'], - [['code', 'tags'], 'string'], - [['created_at', 'updated_at'], 'safe'], - [['active'], 'boolean'], + [['code', 'tag'], 'string'], + [['date_add', 'date_update'], 'safe'], + [['status'], 'boolean'], ]; } @@ -67,14 +67,14 @@ class ArticleCategory extends ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), - 'active' => Yii::t('app', 'Active'), + 'article_category_id' => Yii::t('app', 'ID'), + 'status' => Yii::t('app', 'Active'), 'sort' => Yii::t('app', 'Sort'), 'code' => Yii::t('app', 'Code'), - 'created_at' => Yii::t('app', 'Created At'), - 'updated_at' => Yii::t('app', 'Updated At'), - 'tags' => Yii::t('app', 'Tags'), - 'parent_id' => Yii::t('app', 'Parent ID'), + 'date_add' => Yii::t('app', 'Created At'), + 'date_update' => Yii::t('app', 'Updated At'), + 'tag' => Yii::t('app', 'Tags'), + 'article_category_pid' => Yii::t('app', 'Parent ID'), ]; } @@ -83,7 +83,7 @@ class ArticleCategory extends ActiveRecord */ public function getArticles() { - return $this->hasMany(Article::className(), ['category_id' => 'id']); + return $this->hasMany(Article::className(), ['article_id' => 'article_id'])->viaTable('article_to_category', ['article_category_id' => 'article_category_id']) ; } /** @@ -91,7 +91,7 @@ class ArticleCategory extends ActiveRecord */ public function getParent() { - return $this->hasOne(ArticleCategory::className(), ['id' => 'parent_id']); + return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_pid']); } /** @@ -99,7 +99,7 @@ class ArticleCategory extends ActiveRecord */ public function getArticleCategories() { - return $this->hasMany(ArticleCategory::className(), ['parent_id' => 'id']); + return $this->hasMany(ArticleCategory::className(), ['article_category_pid' => 'article_category_id']); } /** @@ -107,7 +107,7 @@ class ArticleCategory extends ActiveRecord */ public function getArticleCategoryLangs() { - return $this->hasMany(ArticleCategoryLang::className(), ['category_id' => 'id']); + return $this->hasMany(ArticleCategoryLang::className(), ['article_category_id' => 'article_category_id']); } /** @@ -115,18 +115,18 @@ class ArticleCategory extends ActiveRecord */ public function getArticleCategoryMedia() { - return $this->hasMany(ArticleCategoryMedia::className(), ['category_id' => 'id']); + return $this->hasMany(ArticleCategoryMedia::className(), ['article_category_id' => 'article_category_id']); } public static function findArticleCategoryDropdown($id) { $query = new Query(); - return $query->select(['l.name', 'c.id']) + return $query->select(['l.name', 'c.article_category_id']) ->from(['article_category c']) - ->leftJoin(['article_category_lang l'], 'c.id = l.category_id') - ->where(['l.lang_id' => 0, 'c.active' => 1]) - ->andWhere(['not', ['c.id' => $id]]) - ->indexBy('id') + ->leftJoin(['article_category_lang l'], 'c.article_category_id = l.article_category_id') + ->where(['l.language_id' => 0, 'c.status' => 1]) + ->andWhere(['not', ['c.article_category_id' => $id]]) + ->indexBy('article_category_id') ->column(); } diff --git a/common/modules/blog/models/ArticleCategoryLang.php b/common/modules/blog/models/ArticleCategoryLang.php index 10a5c97..e461116 100644 --- a/common/modules/blog/models/ArticleCategoryLang.php +++ b/common/modules/blog/models/ArticleCategoryLang.php @@ -8,18 +8,18 @@ use Yii; /** * This is the model class for table "article_category_lang". * - * @property integer $id - * @property integer $lang_id - * @property integer $category_id + * @property integer $article_category_lang_id + * @property integer $language_id + * @property integer $article_category_id * @property string $text * @property string $preview * @property string $seo_url * @property string $name * @property string $meta_title * @property string $meta_descr - * @property string $meta_keywords + * @property string $meta_keyword * @property string $h1_tag - * @property string $tags + * @property string $tag * * @property ArticleCategory $category * @property Language $lang @@ -51,9 +51,9 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord public function rules() { return [ - [['lang_id', 'category_id'], 'integer'], + [['language_id', 'article_category_id'], 'integer'], [['text', 'name'], 'required'], - [['text', 'preview', 'seo_url', 'name', 'meta_title', 'meta_descr', 'meta_keywords', 'h1_tag', 'tags'], 'string'], + [['text', 'preview', 'seo_url', 'name', 'meta_title', 'meta_descr', 'meta_keyword', 'h1_tag', 'tag'], 'string'], ['seo_url', function($attribute, $params) { $pattern = "/^[a-zA-Z\d_-]+$/"; if(!preg_match($pattern, $this->$attribute)) { @@ -69,18 +69,18 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), - 'lang_id' => Yii::t('app', 'Lang ID'), - 'category_id' => Yii::t('app', 'Category ID'), + 'article_category_lang_id' => Yii::t('app', 'ID'), + 'language_id' => Yii::t('app', 'Lang ID'), + 'article_category_id' => Yii::t('app', 'Category ID'), 'text' => Yii::t('app', 'Text'), 'preview' => Yii::t('app', 'Preview'), 'seo_url' => Yii::t('app', 'Seo Url'), 'name' => Yii::t('app', 'Name'), 'meta_title' => Yii::t('app', 'Meta Title'), 'meta_descr' => Yii::t('app', 'Meta Descr'), - 'meta_keywords' => Yii::t('app', 'Meta Keywords'), + 'meta_keyword' => Yii::t('app', 'Meta Keywords'), 'h1_tag' => Yii::t('app', 'H1 Tag'), - 'tags' => Yii::t('app', 'Tags'), + 'tag' => Yii::t('app', 'Tags'), ]; } @@ -89,7 +89,7 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord */ public function getCategory() { - return $this->hasOne(ArticleCategory::className(), ['id' => 'category_id']); + return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_id']); } /** @@ -97,6 +97,6 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord */ public function getLang() { - return $this->hasOne(Language::className(), ['language_id' => 'lang_id']); + return $this->hasOne(Language::className(), ['language_id' => 'language_id']); } } diff --git a/common/modules/blog/models/ArticleCategoryMedia.php b/common/modules/blog/models/ArticleCategoryMedia.php index 4c7c1aa..a923910 100644 --- a/common/modules/blog/models/ArticleCategoryMedia.php +++ b/common/modules/blog/models/ArticleCategoryMedia.php @@ -8,16 +8,18 @@ use Yii; /** * This is the model class for table "article_category_media". * - * @property integer $id - * @property integer $category_id + * @property integer $article_category_media_id + * @property integer $article_category_id * @property integer $media_id * @property string $media_alt * @property string $media_title * @property string $media_caption * @property string $type + * @property string $language_id * * @property ArticleCategory $category * @property Media $media + * @property Language $lang */ class ArticleCategoryMedia extends \yii\db\ActiveRecord { @@ -36,9 +38,9 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord public function scenarios() { $scenarios = parent::scenarios(); - $scenarios[self::SCENARIO_FULL] = ['id', 'category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile']; - $scenarios[self::SCENARIO_PREVIEW] = ['id', 'category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile']; - $scenarios[self::SCENARIO_ADDITIONAL] = ['id', 'category_id', 'media_id', 'type', 'imageFile']; + $scenarios[self::SCENARIO_FULL] = ['article_category_media_id', 'article_category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile']; + $scenarios[self::SCENARIO_PREVIEW] = ['article_category_media_id', 'article_category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile']; + $scenarios[self::SCENARIO_ADDITIONAL] = ['article_category_media_id', 'article_category_id', 'media_id', 'type', 'imageFile']; return $scenarios; } @@ -48,8 +50,8 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord public function rules() { return [ - [['category_id', 'media_id'], 'required'], - [['category_id', 'media_id'], 'integer'], + [['article_category_id', 'media_id'], 'required'], + [['article_category_id', 'media_id'], 'integer'], [['media_alt', 'media_title', 'media_caption'], 'string'], [['type'], 'string', 'max' => 10], [['imageFile'], 'file', 'extensions' => 'png, gif, jpg, jpeg', 'skipOnEmpty' => true, 'on' => self::SCENARIO_FULL], @@ -64,14 +66,15 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), - 'category_id' => Yii::t('app', 'Category ID'), + 'article_category_media_id' => Yii::t('app', 'ID'), + 'article_category_id' => Yii::t('app', 'Category ID'), 'media_id' => Yii::t('app', 'Media ID'), 'media_alt' => Yii::t('app', 'Media Alt'), 'media_title' => Yii::t('app', 'Media Title'), 'media_caption' => Yii::t('app', 'Media Caption'), 'type' => Yii::t('app', 'Type'), 'imageFile' => Yii::t('app', 'Image File'), + 'language_id' => Yii::t('app', 'Language ID'), ]; } @@ -80,7 +83,7 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord */ public function getCategory() { - return $this->hasOne(ArticleCategory::className(), ['id' => 'category_id']); + return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_id']); } /** @@ -88,12 +91,12 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord */ public function getMedia() { - return $this->hasOne(Media::className(), ['id' => 'media_id']); + return $this->hasOne(Media::className(), ['media_id' => 'media_id']); } public function upload($category_id) { - $this->category_id = $category_id; + $this->article_category_id = $category_id; if(is_array($this->imageFile)) { $ok = true; foreach($this->imageFile as $image) { @@ -101,7 +104,7 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord $media = new Media(); $media->imageFile = $image; $media->upload(); - $media_category->media_id = $media->id; + $media_category->media_id = $media->media_id; $ok = $media_category->save() && $ok; unset($media_category); } @@ -110,19 +113,19 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord $media = new Media(); $media->imageFile = $this->imageFile; $media->upload(); - $this->media_id = $media->id; + $this->media_id = $media->media_id; return $this->save(); } } public function replace($category_id, $removeMedia = false) { - $this->category_id = $category_id; + $this->article_category_id = $category_id; if($removeMedia) { - $category_media = ArticleCategoryMedia::find()->select('media_id')->where(['category_id' => $this->category_id, 'type' => $this->type])->column(); + $category_media = ArticleCategoryMedia::find()->select('media_id')->where(['article_category_id' => $this->article_category_id, 'type' => $this->type])->column(); $media = array(); foreach($category_media as $media_id) { - $media[] = Media::findOne(['id' => $media_id]); + $media[] = Media::findOne(['media_id' => $media_id]); } $media = array_unique($media); foreach($media as $one_media) { @@ -140,17 +143,17 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord $media = new Media(); $media->imageFile = $image; $media->upload(); - $media_category->media_id = $media->id; + $media_category->media_id = $media->media_id; $ok = $media_category->save() && $ok; unset($media_category); } return $ok; } elseif(!empty($this->imageFile)) { - ArticleCategoryMedia::deleteAll(['category_id' => $this->category_id, 'type' => $this->type]); + ArticleCategoryMedia::deleteAll(['category_id' => $this->article_category_id, 'type' => $this->type]); $media = new Media(); $media->imageFile = $this->imageFile; $media->upload(); - $this->media_id = $media->id; + $this->media_id = $media->media_id; $this->setIsNewRecord(true); return $this->save(); } diff --git a/common/modules/blog/models/ArticleLang.php b/common/modules/blog/models/ArticleLang.php index 7bc23b7..75ef25c 100644 --- a/common/modules/blog/models/ArticleLang.php +++ b/common/modules/blog/models/ArticleLang.php @@ -8,8 +8,8 @@ use common\models\Language; /** * This is the model class for table "article_lang". * - * @property integer $id - * @property integer $lang_id + * @property integer $article_lang_id + * @property integer $language_id * @property integer $article_id * @property string $text * @property string $seo_url @@ -17,9 +17,9 @@ use common\models\Language; * @property string $preview * @property string $meta_title * @property string $meta_descr - * @property string $meta_keywords + * @property string $meta_keyword * @property string $h1_tag - * @property string $tags + * @property string $tag * * @property Article $article * @property Language $lang @@ -40,9 +40,9 @@ class ArticleLang extends \yii\db\ActiveRecord public function rules() { return [ - [['lang_id', 'text', 'name'], 'required'], - [['lang_id', 'article_id'], 'integer'], - [['text', 'seo_url', 'name', 'preview', 'meta_title', 'meta_descr', 'meta_keywords', 'h1_tag', 'tags'], 'string'] + [['language_id', 'text', 'name'], 'required'], + [['language_id', 'article_id'], 'integer'], + [['text', 'seo_url', 'name', 'preview', 'meta_title', 'meta_descr', 'meta_keyword', 'h1_tag', 'tag'], 'string'] ]; } @@ -52,8 +52,8 @@ class ArticleLang extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), - 'lang_id' => Yii::t('app', 'Lang ID'), + 'article_lang_id' => Yii::t('app', 'ID'), + 'language_id' => Yii::t('app', 'Lang ID'), 'article_id' => Yii::t('app', 'Article ID'), 'text' => Yii::t('app', 'Text'), 'seo_url' => Yii::t('app', 'Seo Url'), @@ -61,9 +61,9 @@ class ArticleLang extends \yii\db\ActiveRecord 'preview' => Yii::t('app', 'Preview'), 'meta_title' => Yii::t('app', 'Meta Title'), 'meta_descr' => Yii::t('app', 'Meta Descr'), - 'meta_keywords' => Yii::t('app', 'Meta Keywords'), + 'meta_keyword' => Yii::t('app', 'Meta Keywords'), 'h1_tag' => Yii::t('app', 'H1 Tag'), - 'tags' => Yii::t('app', 'Tags'), + 'tag' => Yii::t('app', 'Tags'), ]; } @@ -72,7 +72,7 @@ class ArticleLang extends \yii\db\ActiveRecord */ public function getArticle() { - return $this->hasOne(Article::className(), ['id' => 'article_id']); + return $this->hasOne(Article::className(), ['article_id' => 'article_id']); } /** @@ -80,6 +80,6 @@ class ArticleLang extends \yii\db\ActiveRecord */ public function getLang() { - return $this->hasOne(Language::className(), ['language_id' => 'lang_id']); + return $this->hasOne(Language::className(), ['language_id' => 'language_id']); } } diff --git a/common/modules/blog/models/ArticleMedia.php b/common/modules/blog/models/ArticleMedia.php index 23cebd7..42ccfa0 100644 --- a/common/modules/blog/models/ArticleMedia.php +++ b/common/modules/blog/models/ArticleMedia.php @@ -9,13 +9,14 @@ use yii\web\UploadedFile; /** * This is the model class for table "article_media". * - * @property integer $id + * @property integer $article_media_id * @property integer $article_id * @property integer $media_id * @property string $type * @property string $media_alt * @property string $media_title * @property string $media_caption + * @property integer $language_id * * @property Article $article * @property Media $media @@ -37,9 +38,9 @@ class ArticleMedia extends \yii\db\ActiveRecord public function scenarios() { $scenarios = parent::scenarios(); - $scenarios[self::SCENARIO_FULL] = ['id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile', 'lang_id']; - $scenarios[self::SCENARIO_PREVIEW] = ['id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile', 'lang_id']; - $scenarios[self::SCENARIO_ADDITIONAL] = ['id', 'article_id', 'media_id', 'type', 'imageFile', 'lang_id']; + $scenarios[self::SCENARIO_FULL] = ['article_media_id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile', 'language_id']; + $scenarios[self::SCENARIO_PREVIEW] = ['article_media_id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile', 'language_id']; + $scenarios[self::SCENARIO_ADDITIONAL] = ['article_media_id', 'article_id', 'media_id', 'type', 'imageFile', 'language_id']; return $scenarios; } @@ -50,7 +51,7 @@ class ArticleMedia extends \yii\db\ActiveRecord { return [ [['article_id', 'media_id'], 'required'], - [['article_id', 'media_id', 'lang_id'], 'integer'], + [['article_id', 'media_id', 'language_id'], 'integer'], [['media_alt', 'media_title', 'media_caption'], 'string'], [['type'], 'string', 'max' => 10], [['imageFile'], 'file', 'extensions' => 'png, gif, jpg, jpeg', 'skipOnEmpty' => true, 'on' => self::SCENARIO_FULL], @@ -65,7 +66,7 @@ class ArticleMedia extends \yii\db\ActiveRecord public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), + 'article_media_id' => Yii::t('app', 'ID'), 'article_id' => Yii::t('app', 'Article ID'), 'media_id' => Yii::t('app', 'Media ID'), 'type' => Yii::t('app', 'Type'), @@ -81,7 +82,7 @@ class ArticleMedia extends \yii\db\ActiveRecord */ public function getArticle() { - return $this->hasOne(Article::className(), ['id' => 'article_id']); + return $this->hasOne(Article::className(), ['article_id' => 'article_id']); } /** @@ -89,7 +90,7 @@ class ArticleMedia extends \yii\db\ActiveRecord */ public function getMedia() { - return $this->hasOne(Media::className(), ['id' => 'media_id']); + return $this->hasOne(Media::className(), ['media_id' => 'media_id']); } public function upload($article_id) @@ -102,7 +103,7 @@ class ArticleMedia extends \yii\db\ActiveRecord $media = new Media(); $media->imageFile = $image; $media->upload(); - $media_article->media_id = $media->id; + $media_article->media_id = $media->media_id; $ok = $media_article->save() && $ok; unset($media_article); } @@ -111,7 +112,7 @@ class ArticleMedia extends \yii\db\ActiveRecord $media = new Media(); $media->imageFile = $this->imageFile; $media->upload(); - $this->media_id = $media->id; + $this->media_id = $media->media_id; return $this->save(); } } @@ -120,10 +121,10 @@ class ArticleMedia extends \yii\db\ActiveRecord { $this->article_id = $article_id; if($removeMedia && !$this->getIsNewRecord()) { - $article_media = ArticleMedia::find()->select('media_id')->where(['article_id' => $this->article_id, 'type' => $this->type, 'lang_id' => $this->lang_id])->column(); + $article_media = ArticleMedia::find()->select('media_id')->where(['article_id' => $this->article_id, 'type' => $this->type, 'language_id' => $this->language_id])->column(); $media = array(); foreach($article_media as $media_id) { - $media[] = Media::findOne(['id' => $media_id]); + $media[] = Media::findOne(['media_id' => $media_id]); } $media = array_unique($media); foreach($media as $one_media) { @@ -141,17 +142,17 @@ class ArticleMedia extends \yii\db\ActiveRecord $media = new Media(); $media->imageFile = $image; $media->upload(); - $media_article->media_id = $media->id; + $media_article->media_id = $media->media_id; $ok = $media_article->save() && $ok; unset($media_article); } return $ok; } elseif(!empty($this->imageFile)) { - ArticleMedia::deleteAll(['article_id' => $this->article_id, 'type' => $this->type, 'lang_id' => $this->lang_id]); + ArticleMedia::deleteAll(['article_id' => $this->article_id, 'type' => $this->type, 'language_id' => $this->language_id]); $media = new Media(); $media->imageFile = $this->imageFile; $media->upload(); - $this->media_id = $media->id; + $this->media_id = $media->media_id; $this->setIsNewRecord(true); return $this->save(); } diff --git a/common/modules/blog/models/ArticleToCategory.php b/common/modules/blog/models/ArticleToCategory.php index a3d62d0..f665d84 100644 --- a/common/modules/blog/models/ArticleToCategory.php +++ b/common/modules/blog/models/ArticleToCategory.php @@ -8,7 +8,7 @@ use Yii; * This is the model class for table "article_to_category". * * @property integer $article_id - * @property integer $category_id + * @property integer $article_category_id * * @property Article $article * @property ArticleCategory $category @@ -29,7 +29,7 @@ class ArticleToCategory extends \yii\db\ActiveRecord public function rules() { return [ - [['article_id', 'category_id'], 'integer'] + [['article_id', 'article_category_id'], 'integer'] ]; } @@ -40,7 +40,7 @@ class ArticleToCategory extends \yii\db\ActiveRecord { return [ 'article_id' => Yii::t('app', 'Article ID'), - 'category_id' => Yii::t('app', 'Category ID'), + 'article_category_id' => Yii::t('app', 'Category ID'), ]; } @@ -49,7 +49,7 @@ class ArticleToCategory extends \yii\db\ActiveRecord */ public function getArticle() { - return $this->hasOne(Article::className(), ['id' => 'article_id']); + return $this->hasOne(Article::className(), ['article_id' => 'article_id']); } /** @@ -57,6 +57,6 @@ class ArticleToCategory extends \yii\db\ActiveRecord */ public function getCategory() { - return $this->hasOne(ArticleCategory::className(), ['id' => 'category_id']); + return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_id']); } } diff --git a/common/modules/blog/views/ajax/_article_form.php b/common/modules/blog/views/ajax/_article_form.php index ecc3dbc..47e23d4 100644 --- a/common/modules/blog/views/ajax/_article_form.php +++ b/common/modules/blog/views/ajax/_article_form.php @@ -3,31 +3,36 @@ use yii\bootstrap\ActiveField; use mihaildev\ckeditor\CKEditor; -$form = \yii\bootstrap\ActiveForm::begin(); +if(empty($form)) { + $new_form = true; + $form = \yii\bootstrap\ActiveForm::begin(); +} ?>
    - $article_lang, 'attribute' => "[$model->language_id]lang_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?> + $model, 'attribute' => "[$model->language_id]language_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?> - $article_lang, 'attribute' => "[$model->language_id]text", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?> + $model, 'attribute' => "[$model->language_id]text", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?> - $article_lang, 'attribute' => "[$model->language_id]preview", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?> + $model, 'attribute' => "[$model->language_id]preview", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?> - $article_lang, 'attribute' => "[$model->language_id]seo_url"]))->textInput() ?> + $model, 'attribute' => "[$model->language_id]seo_url"]))->textInput() ?> - $article_lang, 'attribute' => "[$model->language_id]name"]))->textInput() ?> + $model, 'attribute' => "[$model->language_id]name"]))->textInput() ?> - $article_lang, 'attribute' => "[$model->language_id]meta_title"]))->textInput() ?> + $model, 'attribute' => "[$model->language_id]meta_title"]))->textInput() ?> - $article_lang, 'attribute' => "[$model->language_id]meta_descr"]))->textarea() ?> + $model, 'attribute' => "[$model->language_id]meta_descr"]))->textarea() ?> - $article_lang, 'attribute' => "[$model->language_id]meta_keywords"]))->textInput() ?> + $model, 'attribute' => "[$model->language_id]meta_keyword"]))->textInput() ?> - $article_lang, 'attribute' => "[$model->language_id]h1_tag"]))->textInput() ?> + $model, 'attribute' => "[$model->language_id]h1_tag"]))->textInput() ?> - $article_lang, 'attribute' => "[$model->language_id]tags"]))->textInput() ?> + $model, 'attribute' => "[$model->language_id]tag"]))->textInput() ?>
    end(); + if($new_form) { + $form->end(); + } ?> diff --git a/common/modules/blog/views/ajax/_article_media_form.php b/common/modules/blog/views/ajax/_article_media_form.php index 973659d..8ff29f3 100644 --- a/common/modules/blog/views/ajax/_article_media_form.php +++ b/common/modules/blog/views/ajax/_article_media_form.php @@ -7,7 +7,7 @@ $form = \yii\bootstrap\ActiveForm::begin(); ?>
    - $article_lang, 'attribute' => "[$model->language_id][$type]lang_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?> + $article_lang, 'attribute' => "[$model->language_id][$type]language_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?> $article_lang, 'attribute' => "[$model->language_id][$type]imageFile"]))->fileInput(['class' => 'image_inputs_field']) ?> diff --git a/common/modules/blog/views/ajax/_category_form.php b/common/modules/blog/views/ajax/_category_form.php index 6b5caf1..521317b 100644 --- a/common/modules/blog/views/ajax/_category_form.php +++ b/common/modules/blog/views/ajax/_category_form.php @@ -7,7 +7,7 @@ $form = \yii\bootstrap\ActiveForm::begin(); ?>
    - $category_lang, 'attribute' => "[$model->language_id]lang_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?> + $category_lang, 'attribute' => "[$model->language_id]language_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?> $category_lang, 'attribute' => "[$model->language_id]text", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?> @@ -21,11 +21,11 @@ $form = \yii\bootstrap\ActiveForm::begin(); $category_lang, 'attribute' => "[$model->language_id]meta_descr"]))->textarea() ?> - $category_lang, 'attribute' => "[$model->language_id]meta_keywords"]))->textInput() ?> + $category_lang, 'attribute' => "[$model->language_id]meta_keyword"]))->textInput() ?> $category_lang, 'attribute' => "[$model->language_id]h1_tag"]))->textInput() ?> - $category_lang, 'attribute' => "[$model->language_id]tags"]))->textInput() ?> + $category_lang, 'attribute' => "[$model->language_id]tag"]))->textInput() ?>
    field($article, 'code')->hint(Yii::t('app', 'Insensitive latin non-space'))->textInput() ?> - field($article, 'tags')->hint(Yii::t('app', 'Comma-separated'))->textInput() ?> + field($article, 'tag')->hint(Yii::t('app', 'Comma-separated'))->textInput() ?> field($article, 'sort')->input('number') ?> - field($article, 'parent_id') - ->dropDownList(Article::findArticleDropdown($article->id), ['prompt' => Yii::t('app', 'Select parent')]) ?> + field($article, 'article_pid') + ->dropDownList(Article::findArticleDropdown($article->article_id), ['prompt' => Yii::t('app', 'Select parent')]) ?> field($article, 'articleCategoriesArray') ->dropDownList(ArticleCategory::findArticleCategoryDropdown(NULL), ['multiple' => 'multiple'])->label(\Yii::t('app', 'Article Categories Array')); ?> - field($article, 'active')->checkbox() ?> + field($article, 'status')->checkbox() ?>