'api'

lchjczw · Feb 16, 2017 · 7ca7511 · 7ca7511
1 parent 974d147
commit 7ca7511
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 21 deletions.
diff --git a/api/common/controllers/Controller.php b/api/common/controllers/Controller.php
@@ -20,7 +20,7 @@ class Controller extends \yii\rest\Controller
  public function behaviors()
  {
  $behaviors = parent::behaviors();
- unset($behaviors['contentNegotiator']['formats']['application/xml']);
+ unset($behaviors['contentNegotiator']);
  $behaviors['cors'] = [
  'class' => Cors::className(),
  ];

diff --git a/api/config/main.php b/api/config/main.php
@@ -6,21 +6,11 @@
 return [
  'id' => 'app-api',
  'basePath' => dirname(__DIR__),
- 'bootstrap' => ['log'],
  'controllerNamespace' => 'api\common\controllers',
  'components' => [
  'user' => [
  'identityClass' => 'common\modules\user\models\User',
  ],
- 'log' => [
- 'traceLevel' => YII_DEBUG ? 3 : 0,
- 'targets' => [
- [
- 'class' => 'yii\log\FileTarget',
- 'levels' => ['error', 'warning'],
- ],
- ],
- ],
  'urlManager' => [
  'enablePrettyUrl' => true,
  'showScriptName' => false,
@@ -35,6 +25,7 @@
  ],
  ],
  'response' => [
+ 'format' => 'json',
  'on beforeSend' => function($event) {
  $response = $event->sender;
  if ($response->data !== null) {

diff --git a/api/modules/v1/controllers/ArticleController.php b/api/modules/v1/controllers/ArticleController.php
@@ -16,9 +16,11 @@
 
 class ArticleController extends Controller
 {
- public function actionIndex($cid = '')
+ public function actionIndex($cid = null, $module = null)
  {
- $query = Article::find()->published()->andFilterWhere(['category_id' => $cid]);
+ $query = Article::find()->published()
+ ->andFilterWhere(['category_id' => $cid])
+ ->andFilterWhere(['module' => $module]);
  $dataProvider = new ActiveDataProvider([
  'query' => $query,
  'sort' => [

diff --git a/api/modules/v1/models/Article.php b/api/modules/v1/models/Article.php
@@ -11,7 +11,6 @@
 
 class Article extends \common\models\Article
 {
-
  public function extraFields()
  {
  return [

diff --git a/backend/config/main.php b/backend/config/main.php
@@ -59,9 +59,6 @@
  'themeManager' => [
  'class' => 'common\components\ThemeManager',
  ],
- 'pluginManager' => [
- 'class' => 'common\components\PluginManager',
- ],
  ],
  'modules' => [
  'rbac' => [

diff --git a/common/config/main.php b/common/config/main.php
@@ -83,6 +83,9 @@
  'notify' => 'common\components\notify\Handler',
  'moduleManager' => [
  'class' => 'common\\components\\ModuleManager'
- ]
+ ],
+ 'pluginManager' => [
+ 'class' => 'common\components\PluginManager',
+ ],
  ],
 ];
diff --git a/frontend/config/main.php b/frontend/config/main.php
@@ -44,9 +44,6 @@
  }
  }
  ],
- 'pluginManager' => [
- 'class' => 'common\components\PluginManager',
- ],
  'search' => [
  'class' => 'frontend\\components\\Search',
  'engine' => env('SEARCH_ENGINE', 'local')