Merge branch 'master' of git://github.com/noumo/easyii into test

Conflicts: components/API.php controllers/PhotosController.php modules/article/api/Article.php modules/article/models/Category.php modules/article/models/Item.php modules/article/views/a/_form.php modules/article/views/a/index.php modules/article/views/items/_form.php modules/carousel/api/Carousel.php modules/catalog/CatalogModule.php modules/catalog/api/Catalog.php modules/catalog/models/Category.php modules/catalog/views/a/_form.php modules/catalog/views/items/_form.php modules/file/api/File.php modules/gallery/api/Gallery.php modules/gallery/models/Album.php modules/gallery/views/a/_form.php modules/guestbook/api/Guestbook.php modules/news/api/News.php modules/news/models/News.php modules/news/views/a/_form.php modules/page/api/Page.php modules/text/api/Text.php views/modules/settings.php widgets/views/photos.php
noumo · Apr 13, 2015 · 91945cc · 91945cc
2 parents eb86b99 + 7e57211
commit 91945cc
Show file tree

Hide file tree

Showing 104 changed files with 434 additions and 412 deletions.
diff --git a/assets/photos/photos.js b/assets/photos/photos.js
@@ -72,12 +72,13 @@ $(function(){
     photosBody.on('input propertychange', '.photo-description', function(){
         var saveBtn = $(this).siblings('.save-photo-description');
         if(saveBtn.hasClass('disabled')){
-            saveBtn.removeClass('disabled').on('click', function(){
+            saveBtn.removeClass('disabled').on('click', function(e){
+                e.preventDefault();
                 var $this = $(this).unbind('click').addClass('disabled');
                 var tr = $this.closest('tr');
                 var text = $this.siblings('.photo-description').val();
                 $.post(
-                    '/admin/photos/description/'+ tr.data('id'),
+                    $this.attr('href'),
                     {description: text},
                     function(response){
                         if(response.result === 'success'){

diff --git a/components/Controller.php b/components/Controller.php
@@ -18,7 +18,7 @@ public function beforeAction($action)
 
         if(Yii::$app->user->isGuest){
             Yii::$app->user->setReturnUrl(Yii::$app->request->url);
-            return $this->redirect('/admin/sign/in');
+            return $this->redirect(['/admin/sign/in']);
         }
         else{
 

diff --git a/controllers/AdminsController.php b/controllers/AdminsController.php
@@ -15,7 +15,7 @@ public function actionIndex()
         $data = new ActiveDataProvider([
             'query' => Admin::find()->desc(),
         ]);
-        Yii::$app->user->setReturnUrl('/admin/admins');
+        Yii::$app->user->setReturnUrl(['/admin/admins']);
 
         return $this->render('index', [
             'data' => $data
@@ -35,7 +35,7 @@ public function actionCreate()
             else{
                 if($model->save()){
                     $this->flash('success', Yii::t('easyii', 'Admin created'));
-                    return $this->redirect('/admin/admins');
+                    return $this->redirect(['/admin/admins']);
                 }
                 else{
                     $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
@@ -56,7 +56,7 @@ public function actionEdit($id)
 
         if($model === null){
             $this->flash('error', Yii::t('easyii', 'Not found'));
-            return $this->redirect('/admin/admins');
+            return $this->redirect(['/admin/admins']);
         }
 
         if ($model->load(Yii::$app->request->post())) {

diff --git a/controllers/InstallController.php b/controllers/InstallController.php
@@ -47,7 +47,7 @@ public function actionIndex()
             Yii::$app->cache->flush();
             Yii::$app->session->setFlash('root_password', $installForm->root_password);
 
-            return $this->redirect('/admin/install/finish');
+            return $this->redirect(['/admin/install/finish']);
         }
         else {
             $installForm->robot_email = 'noreply@'.Yii::$app->request->serverName;
@@ -68,7 +68,7 @@ public function actionFinish()
                 'password' => $root_password,
             ]);
             if($loginForm->login()){
-                return $this->redirect('/admin/');
+                return $this->redirect(['/admin/']);
             }
         }
 

diff --git a/controllers/ModulesController.php b/controllers/ModulesController.php
@@ -51,7 +51,7 @@ public function actionCreate()
             else{
                 if($model->save()){
                     $this->flash('success', Yii::t('easyii', 'Module created'));
-                    return $this->redirect('/admin/modules');
+                    return $this->redirect(['/admin/modules']);
                 }
                 else{
                     $this->flash('error', Yii::t('Create error. {0}', $model->formatErrors()));
@@ -72,7 +72,7 @@ public function actionEdit($id)
 
         if($model === null){
             $this->flash('error', Yii::t('easyii', 'Not found'));
-            return $this->redirect('/admin/modules');
+            return $this->redirect(['/admin/modules']);
         }
 
         if ($model->load(Yii::$app->request->post())) {
@@ -103,7 +103,7 @@ public function actionSettings($id)
 
         if($model === null){
             $this->flash('error', Yii::t('easyii', 'Not found'));
-            return $this->redirect('/admin/modules');
+            return $this->redirect(['/admin/modules']);
         }
 
         if (Yii::$app->request->post('Settings')) {

diff --git a/controllers/PhotosController.php b/controllers/PhotosController.php
@@ -2,6 +2,7 @@
 namespace yii\easyii\controllers;
 
 use Yii;
+use yii\helpers\Url;
 use yii\web\UploadedFile;
 use yii\web\Response;
 
@@ -31,7 +32,7 @@ public function behaviors()
     public function actionUpload($model, $item_id)
     {
         $success = null;
-        
+
         $photo = new Photo;
         $photo->model = $model;
         $photo->item_id = $item_id;
@@ -52,7 +53,7 @@ public function actionUpload($model, $item_id)
                     ];
                 }
                 else{
-                    @unlink(Yii::getAlias('@webroot').$photo->image);
+                    @unlink(Yii::getAlias('@webroot') . str_replace(Url::base(true), '', $photo->image));
                     $this->error = Yii::t('easyii', 'Create error. {0}', $photo->formatErrors());
                 }
             }

diff --git a/controllers/RedactorController.php b/controllers/RedactorController.php
@@ -4,6 +4,7 @@
 use Yii;
 use yii\web\HttpException;
 use yii\helpers\FileHelper;
+use yii\helpers\Url;
 use yii\web\UploadedFile;
 use yii\web\Response;
 
@@ -116,7 +117,7 @@ public function actionUpload($dir = '')
     private function getResponse($fileName)
     {
         return [
-            'filelink' => 'http://'.Yii::$app->request->serverName.$fileName,
+            'filelink' => $fileName,
             'filename' => basename($fileName)
         ];
     }

diff --git a/controllers/SettingsController.php b/controllers/SettingsController.php
@@ -55,7 +55,7 @@ public function actionEdit($id)
 
         if($model === null || ($model->visibility < (IS_ROOT ? Setting::VISIBLE_ROOT : Setting::VISIBLE_ALL))){
             $this->flash('error', Yii::t('easyii', 'Not found'));
-            return $this->redirect('/admin/settings');
+            return $this->redirect(['/admin/settings']);
         }
 
         if ($model->load(Yii::$app->request->post())) {

diff --git a/controllers/SignController.php b/controllers/SignController.php
@@ -14,7 +14,7 @@ public function actionIn()
         $model = new models\LoginForm;
 
         if (!Yii::$app->user->isGuest || ($model->load(Yii::$app->request->post()) && $model->login())) {
-            return $this->redirect(Yii::$app->user->getReturnUrl('/admin'));
+            return $this->redirect(Yii::$app->user->getReturnUrl(['/admin']));
         } else {
             return $this->render('in', [
                 'model' => $model,

diff --git a/helpers/Image.php b/helpers/Image.php
@@ -5,6 +5,7 @@
 use yii\web\UploadedFile;
 use yii\web\HttpException;
 use yii\helpers\FileHelper;
+use yii\helpers\Url;
 use yii\easyii\helpers\GD;
 
 class Image
@@ -26,6 +27,8 @@ public static function upload(UploadedFile $fileInstance, $dir = '', $resizeWidt
 
     static function createThumbnail($fileName, $width, $height = null, $crop = true)
     {
+        $fileName = str_replace(Url::base(true), '', $fileName);
+
         $webRoot = Yii::getAlias('@webroot');
         if(!strstr($fileName, $webRoot)){
             $fileName = $webRoot . $fileName;

diff --git a/helpers/Upload.php b/helpers/Upload.php
@@ -7,6 +7,7 @@
 use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
 use yii\helpers\FileHelper;
+use yii\helpers\Url;
 
 class Upload
 {
@@ -33,7 +34,7 @@ static function getUploadPath($dir)
 
     static function getLink($fileName)
     {
-        return str_replace('\\', '/', str_replace(Yii::getAlias('@webroot'), '', $fileName));
+        return Url::base(true) . str_replace('\\', '/', str_replace(Yii::getAlias('@webroot'), '', $fileName));
     }
 
     static function getFileName($fileInstanse, $namePostfix = true)

diff --git a/media/js/admin.js b/media/js/admin.js
@@ -51,7 +51,7 @@ $(function(){
         var checkbox = $(this);
         checkbox.switcher('setDisabled', true);
 
-        $.getJSON(checkbox.data('link') + (checkbox.is(':checked') ? 'on' : 'off') + '/' + checkbox.data('id'), function(response){
+        $.getJSON(checkbox.data('link') + '/' + (checkbox.is(':checked') ? 'on' : 'off') + '/' + checkbox.data('id'), function(response){
             if(response.result === 'error'){
                 alert(response.error);
             }

diff --git a/media/js/frontend.js b/media/js/frontend.js
@@ -6,6 +6,6 @@ $(function(){
     $('#easyii-navbar input').switcher({copy: {en: {yes: '', no: ''}}}).on('change', function(){
         var checkbox = $(this);
         checkbox.switcher('setDisabled', true);
-        location.href = '/admin/system/live-edit/'+(checkbox.is(':checked') ? 1 : 0);
+        location.href = checkbox.attr('data-link') + '/' + (checkbox.is(':checked') ? 1 : 0);
     });;
 });
diff --git a/modules/article/ArticleModule.php b/modules/article/ArticleModule.php
@@ -9,9 +9,6 @@ class ArticleModule extends \yii\easyii\components\Module
 
         'enableShort' => true,
         'shortMaxLength' => 255,
-
-        'categoryAutoSlug' => true,
-        'itemAutoSlug' => true,
     ];
 
     public static $installConfig = [

diff --git a/modules/article/api/Article.php b/modules/article/api/Article.php
@@ -3,6 +3,7 @@
 
 use Yii;
 use yii\data\ActiveDataProvider;
+use yii\helpers\Url;
 use yii\widgets\LinkPager;
 
 use yii\easyii\widgets\Colorbox;
@@ -70,7 +71,6 @@ private function findItem($id_slug)
         }
 
         $item->updateCounters(['views' => 1]);
-
         return new ArticleObject($item);
     }
 }
diff --git a/modules/article/controllers/AController.php b/modules/article/controllers/AController.php
@@ -65,7 +65,7 @@ public function actionCreate($parent = null)
                 if($model->save()){
 
                     $this->flash('success', Yii::t('easyii/article', 'Category created'));
-                    return $this->redirect('/admin/article/items/'.$model->primaryKey);
+                    return $this->redirect(['/admin/article/items/index', 'id' => $model->primaryKey]);
                 }
                 else{
                     $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
@@ -84,7 +84,7 @@ public function actionCreate($parent = null)
     public function actionEdit($id)
     {
         if(!($model = Category::findOne($id))){
-            return $this->redirect('/admin/article');
+            return $this->redirect(['/admin/article/']);
         }
 
         if ($model->load(Yii::$app->request->post())) {

diff --git a/modules/article/controllers/ItemsController.php b/modules/article/controllers/ItemsController.php
@@ -26,7 +26,7 @@ public function behaviors()
     public function actionIndex($id)
     {
         if(!($model = Category::findOne($id))){
-            return $this->redirect('/admin/article');
+            return $this->redirect(['/admin/article']);
         }
 
         return $this->render('index', [
@@ -38,7 +38,7 @@ public function actionIndex($id)
     public function actionCreate($id)
     {
         if(!($category = Category::findOne($id))){
-            return $this->redirect('/admin/article');
+            return $this->redirect(['/admin/article']);
         }
 
         $model = new Item;
@@ -62,7 +62,7 @@ public function actionCreate($id)
 
                 if ($model->save()) {
                     $this->flash('success', Yii::t('easyii/article', 'Article created'));
-                    return $this->redirect('/admin/article/items/edit/' . $model->primaryKey);
+                    return $this->redirect(['/admin/article/items/edit', 'id' => $model->primaryKey]);
                 } else {
                     $this->flash('error', Yii::t('easyii', 'Create error. {0}', $model->formatErrors()));
                     return $this->refresh();
@@ -80,7 +80,7 @@ public function actionCreate($id)
     public function actionEdit($id)
     {
         if(!($model = Item::findOne($id))){
-            return $this->redirect('/admin/article');
+            return $this->redirect(['/admin/article']);
         }
 
         if ($model->load(Yii::$app->request->post())) {
@@ -100,7 +100,7 @@ public function actionEdit($id)
 
                 if ($model->save()) {
                     $this->flash('success', Yii::t('easyii/article', 'Article updated'));
-                    return $this->redirect('/admin/article/items/edit/' . $model->primaryKey);
+                    return $this->redirect(['/admin/article/items/edit', 'id' => $model->primaryKey]);
                 } else {
                     $this->flash('error', Yii::t('easyii', 'Update error. {0}', $model->formatErrors()));
                     return $this->refresh();

diff --git a/modules/article/models/Category.php b/modules/article/models/Category.php
@@ -28,10 +28,7 @@ public function rules()
             ['image', 'image'],
             ['item_count', 'integer'],
             ['slug', 'match', 'pattern' => self::$SLUG_PATTERN, 'message' => Yii::t('easyii', 'Slug can contain only 0-9, a-z and "-" characters (max: 128).')],
-            ['slug', 'default', 'value' => null],
-            ['slug', 'unique', 'when' => function($model){
-                return $model->slug && !self::autoSlug();
-            }],
+            ['slug', 'default', 'value' => null]
         ];
     }
 
@@ -50,25 +47,18 @@ public function behaviors()
         return [
             SortableModel::className(),
             'seoBehavior' => SeoBehavior::className(),
+            'sluggable' => [
+                'class' => SluggableBehavior::className(),
+                'attribute' => 'title',
+                'ensureUnique' => true
+            ],
             'tree' => [
                 'class' => NestedSetsBehavior::className(),
                 'treeAttribute' => 'tree'
             ]
         ];
     }
 
-    public function beforeValidate()
-    {
-        if(self::autoSlug() && (!$this->isNewRecord || ($this->isNewRecord && $this->slug == ''))){
-            $this->attachBehavior('sluggable', [
-                'class' => SluggableBehavior::className(),
-                'attribute' => 'title',
-                'ensureUnique' => true
-            ]);
-        }
-        return parent::beforeValidate();
-    }
-
     public static function getTree()
     {
         $collection = self::find()->sort()->asArray()->all();
@@ -134,17 +124,11 @@ public function afterDelete()
     {
         parent::afterDelete();
 
-        foreach($this->getItems()->all() as $item){
+        foreach ($this->getItems()->all() as $item) {
             $item->delete();
         }
-
         if($this->image) {
             @unlink(Yii::getAlias('@webroot') . $this->image);
         }
     }
-
-    public static function autoSlug()
-    {
-        return Yii::$app->getModule('admin')->activeModules['article']->settings['categoryAutoSlug'];
-    }
 }