Commit 959e315c authored by 夏彬's avatar 夏彬

去除移动端的限制

parent 16ac7cc7
......@@ -8,7 +8,6 @@ use common\models\CourseTeacher;
use common\models\Courseware;
use common\models\UploadPools;
use frontend\components\ClassesFilter;
use frontend\components\MobileFilter;
use frontend\models\CoursePublishForm;
use Yii;
use yii\filters\AccessControl;
......@@ -34,30 +33,26 @@ class MyCourseController extends \yii\web\Controller
'class' => AccessControl::className(),
'rules' => [
[
'allow' => true,
'allow' => TRUE,
'roles' => ['@']
]
]
], [
'class' => ClassesFilter::className(),
'checkStatus' => true
], [
'class' => MobileFilter::className(),
'only' => ['publish', 'edit'],
'message' => '移动端暂不支持发布课程'
'checkStatus' => TRUE
]
];
}
/**
* 课程列表
*
*
* @return string
*/
public function actionIndex()
{
$list = Course::getCourseListsByClassId($this->classStatus['id'], null, 12, null);
return $this->render('index', ['count'=>$list['count'], 'list'=>$list['data'], 'pagination'=>$list['pagination']]);
$list = Course::getCourseListsByClassId($this->classStatus['id'], NULL, 12, NULL);
return $this->render('index', ['count' => $list['count'], 'list' => $list['data'], 'pagination' => $list['pagination']]);
}
/**
......@@ -72,7 +67,7 @@ class MyCourseController extends \yii\web\Controller
//视频上传Token
$videoToken = $this->getUploadToken('video');
return $this->render('publish', compact('thumbToken', 'videoToken'));
}
......@@ -83,15 +78,15 @@ class MyCourseController extends \yii\web\Controller
* @return string
* @throws NotFoundHttpException
*/
public function actionEdit($id=0)
public function actionEdit($id = 0)
{
$course = Course::findOne(['id'=>$id, 'user_id'=>Yii::$app->user->getId()]);
$course = Course::findOne(['id' => $id, 'user_id' => Yii::$app->user->getId()]);
if (!$course) {
throw new NotFoundHttpException('视频不存在!');
}
$lesson = Courseware::findOne(['course_id'=>$course->id]);
$lesson = Courseware::findOne(['course_id' => $course->id]);
$teacherIds = CourseTeacher::getTeachersIdsByCourseId($course->id);
//图片上传Token
......@@ -140,12 +135,12 @@ class MyCourseController extends \yii\web\Controller
$userId = Yii::$app->user->identity->getId();
$classId = $this->classStatus['id'];
$form = new CoursePublishForm(true);
$form = new CoursePublishForm(TRUE);
$form->class_id = $classId;
$form->load(Yii::$app->request->post());
if (!$form->validate()) {
Utils::ajaxResponse(false, Utils::fetchErrorFirst($form->errors));
Utils::ajaxResponse(FALSE, Utils::fetchErrorFirst($form->errors));
}
//课程数据
......@@ -159,7 +154,7 @@ class MyCourseController extends \yii\web\Controller
//验证课程数据
if (!$course->validate()) {
Utils::ajaxResponse(false, Utils::fetchErrorFirst($course->errors));
Utils::ajaxResponse(FALSE, Utils::fetchErrorFirst($course->errors));
}
//课件数据
......@@ -176,30 +171,30 @@ class MyCourseController extends \yii\web\Controller
//验证课件数据
if (!$courseware->validate()) {
Utils::ajaxResponse(false, Utils::fetchErrorFirst($courseware->errors));
Utils::ajaxResponse(FALSE, Utils::fetchErrorFirst($courseware->errors));
}
//保存课程数据
if (!$course->save()) {
Utils::ajaxResponse(false, Utils::fetchErrorFirst($course->errors));
Utils::ajaxResponse(FALSE, Utils::fetchErrorFirst($course->errors));
}
//保存课件数据
$courseware->course_id = $course->id;
if (!$courseware->save()) {
Utils::ajaxResponse(false, Utils::fetchErrorFirst($courseware->errors));
Utils::ajaxResponse(FALSE, Utils::fetchErrorFirst($courseware->errors));
}
//保存讲师与课程关联数据
CourseTeacher::saveRelations($course->id, $form->teacher);
//认领文件与附件
UploadPools::claimFile($form->vuid['uuid']);
UploadPools::claimFile($form->preview['uuid']);
AttachUpload::claimTmpAttachs($form->tmp, 'course:'.$course->id);
AttachUpload::claimTmpAttachs($form->tmp, 'course:' . $course->id);
Utils::ajaxResponse(true, null, ['course_id'=>$course->id]);
Utils::ajaxResponse(TRUE, NULL, ['course_id' => $course->id]);
}
/**
......@@ -213,13 +208,13 @@ class MyCourseController extends \yii\web\Controller
{
$userId = Yii::$app->user->identity->getId();
$classId = $this->classStatus['id'];
$form = new CoursePublishForm();
$form->class_id = $classId;
$form->load(Yii::$app->request->post());
if (!$form->validate()) {
Utils::ajaxResponse(false, Utils::fetchErrorFirst($form->errors));
Utils::ajaxResponse(FALSE, Utils::fetchErrorFirst($form->errors));
}
if (empty($form->id)) {
......@@ -239,7 +234,7 @@ class MyCourseController extends \yii\web\Controller
$recheck = ($unready || $form->isMustRecheck($course));
$courseware = Courseware::findOne(['course_id' => $course->id]);
$coursewareUpdate = false;
$coursewareUpdate = FALSE;
$oldPreview = $course->preview_pic;
......@@ -254,12 +249,12 @@ class MyCourseController extends \yii\web\Controller
//仅重审核时可以更换视频
if ($form->vuid && !$unready) {
Utils::ajaxResponse(false, '当前课程状态不允许更换视频!');
Utils::ajaxResponse(FALSE, '当前课程状态不允许更换视频!');
}
//验证课程数据
if (!$course->validate()) {
Utils::ajaxResponse(false, Utils::fetchErrorFirst($course->errors));
Utils::ajaxResponse(FALSE, Utils::fetchErrorFirst($course->errors));
}
//保存课程数据
......@@ -270,26 +265,26 @@ class MyCourseController extends \yii\web\Controller
//更换视频
if ($form->vuid && $form->vuid['key'] != $course['name']) {
UploadPools::deleteFile('video:'.$courseware->name);
UploadPools::deleteFile('video:' . $courseware->name);
UploadPools::claimFile($form->vuid['uuid']);
$courseware->name = $form->vuid['key'];
if ($courseware->src_stand) {
UploadPools::deleteFile('video:'.$courseware->src_stand);
UploadPools::deleteFile('video:' . $courseware->src_stand);
$courseware->src_stand = '';
}
if ($courseware->src_free) {
UploadPools::deleteFile('video:'.$courseware->src_free);
UploadPools::deleteFile('video:' . $courseware->src_free);
$courseware->src_free = '';
}
$coursewareUpdate = true;
$coursewareUpdate = TRUE;
}
if ($recheck && $courseware->status != Course::STATUS_UNCHECK) {
$courseware->status = Course::STATUS_UNCHECK;
$coursewareUpdate = true;
$coursewareUpdate = TRUE;
}
$coursewareUpdate && $courseware->update();
......@@ -297,12 +292,12 @@ class MyCourseController extends \yii\web\Controller
//认领文件与附件,删除老文件
if ($form->preview) {
UploadPools::claimFile($form->preview['uuid']);
UploadPools::deleteFile('public:'.$oldPreview);
UploadPools::deleteFile('public:' . $oldPreview);
}
AttachUpload::claimTmpAttachs($form->tmp, 'course:'.$course->id);
AttachUpload::claimTmpAttachs($form->tmp, 'course:' . $course->id);
Utils::ajaxResponse(true, null, ['course_id'=>$course->id, 'recheck'=>$recheck]);
Utils::ajaxResponse(TRUE, NULL, ['course_id' => $course->id, 'recheck' => $recheck]);
}
/**
......@@ -329,7 +324,7 @@ class MyCourseController extends \yii\web\Controller
}
if ($course['status'] != Course::STATUS_UNCHECK) {
return $this->redirect('home/'.$course['id']);
return $this->redirect('home/' . $course['id']);
}
return $this->render('result', compact('course', 'action'));
......@@ -351,11 +346,11 @@ class MyCourseController extends \yii\web\Controller
$model->tmp = Yii::$app->request->post('tmp');
$result = $model->uploadStorage();
if ($result === false) {
return ['success'=>false, 'msg'=>Utils::fetchErrorFirst($model->errors)];
if ($result === FALSE) {
return ['success' => FALSE, 'msg' => Utils::fetchErrorFirst($model->errors)];
}
return ['success'=>true, 'msg'=>'', 'file_path'=>$result['src'], 'key'=>$result['key'], 'uuid'=>$result['uuid']];
return ['success' => TRUE, 'msg' => '', 'file_path' => $result['src'], 'key' => $result['key'], 'uuid' => $result['uuid']];
}
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment