Dev

AdminModule.php

@@ -12,7 +12,7 @@
 
 class AdminModule extends \yii\base\Module implements BootstrapInterface
 {
-    const VERSION = 0.9;
+    const VERSION = 0.92;
 
     public $settings;
     public $activeModules;
@@ -41,7 +41,7 @@ public function init()
 
         if (Yii::$app instanceof yii\web\Application) {
             define('IS_ROOT', !Yii::$app->user->isGuest && Yii::$app->user->identity->isRoot());
-            define('LIVE_EDIT', !Yii::$app->user->isGuest && Yii::$app->session->get('easyii_live_edit'));
+            define('LIVE_EDIT_ENABLED', !Yii::$app->user->isGuest && Yii::$app->session->get('easyii_live_edit'));
         }
     }
 

CHANGELOG.md

@@ -1,6 +1,18 @@
 #Changelog
 
-###0.8.0
+###0.9.1
+* New module Entity
+* File type in catalog fields added
+* Tags added to FAQ
+* Tags added to gallery albums
+* Added immutable setting to all sluggable behaviors
+* Now using vova07 redactor widget and now list of widgets editable in settings
+* New additional field types: html, file, date
+* Remove bootstrap dependency from eaysii frontend toolbar
+* Logs moved to system page
+* A lot of core refactoring
+
+###0.9.0
 * Articles module added
 * FAQ module added
 * SEO h1, title, description, keywords fields added
@@ -24,4 +36,4 @@
 * GD support added (image scale quality improved)
 
 ###0.7.1
-* Minor fixes
+* Minor fixes

actions/BaseSortAction.php

@@ -0,0 +1,57 @@
+<?php
+namespace yii\easyii\actions;
+
+class BaseSortAction extends \yii\base\Action
+{
+    public $model;
+    public $attribute;
+    public $direction;
+    public $addititonalEquality = [];
+
+    public function run($id)
+    {
+        $modelClass = $this->model ? $this->model : $this->controller->modelClass;
+        $attribute = $this->attribute;
+
+        if(!$this->direction){
+            $this->direction = $this->id;
+        }
+        $success = '';
+        if(($model = $modelClass::findOne($id))) {
+            if($this->direction === 'up') {
+                $eq = '>';
+                $orderDir = SORT_ASC;
+            } else {
+                $eq = '<';
+                $orderDir = SORT_DESC;
+            }
+
+            $query = $modelClass::find()->orderBy([$attribute => $orderDir])->limit(1);
+
+            $where = [$eq, $attribute, $model->{$attribute}];
+            if (count($this->addititonalEquality)) {
+                $where = ['and', $where];
+                foreach ($this->addititonalEquality as $item) {
+                    $where[] = [$item => $model->{$item}];
+                }
+            }
+            $modelSwap = $query->where($where)->one();
+
+            if(!empty($modelSwap)) {
+                $newValue = $modelSwap->{$attribute};
+
+                $modelSwap->{$attribute} = $model->{$attribute};
+                $modelSwap->update();
+
+                $model->{$attribute} = $newValue;
+                $model->update();
+
+                $success = ['swap_id' => $modelSwap->primaryKey];
+            }
+        } else {
+            $this->controller->error = \Yii::t('easyii', 'Not found');
+        }
+
+        return $this->controller->formatResponse($success);
+    }
+}

actions/ChangeStatusAction.php

@@ -0,0 +1,25 @@
+<?php
+namespace yii\easyii\actions;
+
+class ChangeStatusAction extends \yii\base\Action
+{
+    public $model;
+    public $status;
+
+    public function run($id)
+    {
+        $modelClass = $this->model ? $this->model : $this->controller->modelClass;
+        if($this->status === null){
+            $this->status = $this->id == 'off' ? 0 : 1;
+        }
+
+        if(($model = $modelClass::findOne($id))){
+            $model->status = $this->status;
+            $model->update();
+        } else {
+            $this->controller->error = Yii::t('easyii', 'Not found');
+        }
+
+        return $this->controller->formatResponse(\Yii::t('easyii', 'Status successfully changed'));
+    }
+}

actions/ClearImageAction.php

@@ -0,0 +1,28 @@
+<?php
+namespace yii\easyii\actions;
+
+use Yii;
+
+class ClearImageAction extends \yii\base\Action
+{
+    public $model;
+
+    public function run($id)
+    {
+        $modelClass = $this->model ? $this->model : $this->controller->modelClass;
+        $model = $modelClass::findOne($id);
+
+        if($model === null){
+            $this->controller->flash('error', Yii::t('easyii', 'Not found'));
+        }
+        elseif($model->image_file){
+            $model->image_file = '';
+            if($model->update()){
+                $this->controller->flash('success', Yii::t('easyii', 'Image cleared'));
+            } else {
+                $this->controller->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
+            }
+        }
+        return $this->controller->back();
+    }
+}

actions/DeleteAction.php

@@ -0,0 +1,19 @@
+<?php
+namespace yii\easyii\actions;
+
+class DeleteAction extends \yii\base\Action
+{
+    public $model;
+    public $successMessage = 'Deleted';
+
+    public function run($id)
+    {
+        $modelClass = $this->model ? $this->model : $this->controller->modelClass;
+        if(($model = $modelClass::findOne($id))){
+            $model->delete();
+        } else {
+            $this->controller->error = \Yii::t('easyii', 'Not found');
+        }
+        return $this->controller->formatResponse($this->successMessage);
+    }
+}

actions/FieldsAction.php

@@ -0,0 +1,81 @@
+<?php
+namespace yii\easyii\actions;
+
+use Yii;
+use yii\easyii\components\CategoryWithFieldsModel;
+
+class FieldsAction extends \yii\base\Action
+{
+    public $model;
+
+    public function run($id)
+    {
+        $modelClass = $this->model ? $this->model : $this->controller->modelClass;
+
+        /** @var \yii\easyii\components\CategoryWithFieldsModel $model */
+        if(!($model = $modelClass::findOne($id))){
+            return $this->controller->redirect(['/admin/' . $this->controller->module->id]);
+        }
+
+        if (Yii::$app->request->post('save'))
+        {
+            $fields = Yii::$app->request->post('Field') ?: [];
+            $result = [];
+
+            foreach($fields as $field){
+                $temp = json_decode($field);
+
+                if( $temp === null && json_last_error() !== JSON_ERROR_NONE ||
+                    empty($temp->name) ||
+                    empty($temp->title) ||
+                    empty($temp->type) ||
+                    !($temp->name = trim($temp->name)) ||
+                    !($temp->title = trim($temp->title)) ||
+                    !array_key_exists($temp->type, CategoryWithFieldsModel::$FIELD_TYPES)
+                ){
+                    continue;
+                }
+                $options = trim($temp->options);
+                if($temp->type == CategoryWithFieldsModel::FIELD_TYPE_SELECT || $temp->type == CategoryWithFieldsModel::FIELD_TYPE_CHECKBOX){
+                    if($options == ''){
+                        continue;
+                    }
+                    $optionsArray = [];
+                    foreach(explode(',', $options) as $option){
+                        $optionsArray[] = trim($option);
+                    }
+                    $options = $optionsArray;
+                }
+
+                $result[] = [
+                    'name' => \yii\helpers\Inflector::slug($temp->name),
+                    'title' => $temp->title,
+                    'type' => $temp->type,
+                    'options' => $options
+                ];
+            }
+
+            $model->fields = $result;
+
+            if($model->update(false, ['fields'])){
+                $ids = [];
+                foreach($model->children()->all() as $child){
+                    $ids[] = $child->primaryKey;
+                }
+                if(count($ids)){
+                    $modelClass::updateAll(['fields' => json_encode($model->fields)], ['in', 'id', $ids]);
+                }
+
+                $this->controller->flash('success', Yii::t('easyii', 'Category updated'));
+            } elseif($model->hasErrors()) {
+                $this->controller->flash('error', Yii::t('easyii','Update error. {0}', $model->formatErrors()));
+            }
+            return $this->controller->refresh();
+        }
+        else {
+            return $this->controller->render('@easyii/views/category/fields', [
+                'model' => $model
+            ]);
+        }
+    }
+}

actions/SortByDateAction.php

@@ -0,0 +1,7 @@
+<?php
+namespace yii\easyii\actions;
+
+class SortByDateAction extends BaseSortAction
+{
+    public $attribute = 'time';
+}

actions/SortByNumAction.php

@@ -0,0 +1,7 @@
+<?php
+namespace yii\easyii\actions;
+
+class SortByNumAction extends BaseSortAction
+{
+    public $attribute = 'order_num';
+}

assets/AdminAsset.php

@@ -14,6 +14,7 @@ class AdminAsset extends \yii\web\AssetBundle
         'yii\web\JqueryAsset',
         'yii\bootstrap\BootstrapAsset',
         'yii\easyii\assets\SwitcherAsset',
+        'yii\easyii\assets\FancyboxAsset',
     ];
     public $jsOptions = array(
         'position' => \yii\web\View::POS_HEAD

assets/FieldsTableAsset.php

@@ -0,0 +1,16 @@
+<?php
+namespace yii\easyii\assets;
+
+class FieldsTableAsset extends \yii\web\AssetBundle
+{
+    public $sourcePath = '@easyii/assets/fields_table';
+    public $css = [
+        'fields.css',
+    ];
+    public $js = [
+        'fields.js'
+    ];
+    public $depends = [
+        'yii\web\JqueryAsset',
+    ];
+}

assets/FrontendAsset.php

@@ -12,7 +12,6 @@ class FrontendAsset extends \yii\web\AssetBundle
     ];
     public $depends = [
         'yii\web\JqueryAsset',
-        'yii\bootstrap\BootstrapAsset',
         'yii\easyii\assets\SwitcherAsset'
     ];
 }

modules/catalog/media/js/fields.js → assets/fields_table/fields.js

@@ -63,6 +63,6 @@ $(function(){
 
     function optionsIsNeeded(type)
     {
-        return type == 'select' || type == 'checkbox';
+        return fieldsWithOptions.indexOf(type) !== -1;
     }
 });

assets/photos/photos.js

@@ -23,7 +23,7 @@ $(function(){
             if(/^image\/(jpeg|png|gif)$/.test(file.type))
             {
                 var formData = new FormData();
-                formData.append('Photo[image]', file);
+                formData.append('Photo[image_file]', file);
 
                 $.ajax({
                     url: $this.closest('form').attr('action'),
@@ -36,7 +36,7 @@ $(function(){
                     success: function(response){
                         if(response.result === 'success'){
                             var html = $(photoTemplate
-                                .replace(/\{\{photo_id\}\}/g, response.photo.id)
+                                .replace(/\{\{id\}\}/g, response.photo.id)
                                 .replace(/\{\{photo_thumb\}\}/g, response.photo.thumb)
                                 .replace(/\{\{photo_image\}\}/g, response.photo.image)
                                 .replace(/\{\{photo_description\}\}/g, ''))
@@ -107,7 +107,7 @@ $(function(){
         var fileData = $this.prop('files')[0];
         var formData = new FormData();
         var changeButton = $this.siblings('.change-image-button').addClass('disabled');
-        formData.append('Photo[image]', fileData);
+        formData.append('Photo[image_file]', fileData);
         $.ajax({
             url: $this.siblings('.change-image-button').attr('href'),
             dataType: 'json',