Commit 2ea3bf8c authored by 杨培's avatar 杨培

试看时间在视频不可更换时不可编辑

parent 05b342d1
...@@ -231,6 +231,9 @@ class MyCourseController extends \yii\web\Controller ...@@ -231,6 +231,9 @@ class MyCourseController extends \yii\web\Controller
throw new ForbiddenHttpException(); throw new ForbiddenHttpException();
} }
//是否提交重新审核,仅待审核和已拒绝状态允许重新进入审核
$isRecheck = in_array($course->status, [Course::STATUS_UNCHECK, Course::STATUS_FAILED]);
$courseware = Courseware::findOne(['course_id' => $course->id]); $courseware = Courseware::findOne(['course_id' => $course->id]);
$coursewareUpdate = false; $coursewareUpdate = false;
...@@ -239,14 +242,14 @@ class MyCourseController extends \yii\web\Controller ...@@ -239,14 +242,14 @@ class MyCourseController extends \yii\web\Controller
//修改课程数据 //修改课程数据
$course->name = $form->name; $course->name = $form->name;
$course->price = $form->price; $course->price = $form->price;
$course->free_time = $form->free_time;
$course->intro = $form->intro; $course->intro = $form->intro;
$course->recommend = $form->recommend; $course->recommend = $form->recommend;
$form->preview && $course->preview_pic = $form->preview['key']; $form->preview && $course->preview_pic = $form->preview['key'];
//是否提交重新审核,仅待审核和已拒绝状态允许重新进入审核 if ($isRecheck) {
$isRecheck = in_array($course->status, [Course::STATUS_UNCHECK, Course::STATUS_FAILED]); $course->free_time = $form->free_time;
$course->status = Course::STATUS_UNCHECK; $course->status = Course::STATUS_UNCHECK;
}
//仅重审核时可以更换视频 //仅重审核时可以更换视频
if ($form->vuid && !$isRecheck) { if ($form->vuid && !$isRecheck) {
......
...@@ -89,15 +89,16 @@ class CoursePublishForm extends Model ...@@ -89,15 +89,16 @@ class CoursePublishForm extends Model
//} //}
$rules = [ $rules = [
[['tmp', 'name', 'price', 'free_time', 'preview', 'vuid'], 'required'], [['tmp', 'name', 'price', 'preview', 'vuid'], 'required'],
[['id', 'free_time'], 'integer'], [['id', 'free_time'], 'integer'],
[['tmp', 'name', 'preview', 'intro'], 'string'], [['tmp', 'name', 'preview', 'intro'], 'string'],
['recommend', 'boolean'],
['free_time', 'default', 'value'=>0],
['free_time', 'integer', 'min' => 0, 'max' => 15],
['tmp', 'match', 'pattern'=>'/^\w{20}$/i'], ['tmp', 'match', 'pattern'=>'/^\w{20}$/i'],
['teacher', 'validateTeachers'], ['teacher', 'validateTeachers'],
['teacher', 'default', 'value'=>[]], ['teacher', 'default', 'value'=>[]],
['free_time', 'integer', 'min' => 0, 'max' => 15],
['preview', 'validateUploadKey'], ['preview', 'validateUploadKey'],
['recommend', 'boolean'],
['vuid', 'validateUploadKey'] ['vuid', 'validateUploadKey']
]; ];
......
...@@ -12,6 +12,8 @@ use common\models\Course; ...@@ -12,6 +12,8 @@ use common\models\Course;
$this->title = '编辑课程信息'; $this->title = '编辑课程信息';
$sourceEditable = ($course->status == Course::STATUS_UNCHECK || $course->status == Course::STATUS_FAILED);
AppAsset::addScript($this, '@web/assets/course_edit.js'); AppAsset::addScript($this, '@web/assets/course_edit.js');
AppAsset::addCss($this, '@web/assets/css/course_publish.css'); AppAsset::addCss($this, '@web/assets/css/course_publish.css');
?> ?>
...@@ -39,7 +41,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css'); ...@@ -39,7 +41,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
<teachers init-teachers="<?=join(',', $teacherIds)?>"></teachers> <teachers init-teachers="<?=join(',', $teacherIds)?>"></teachers>
</div> </div>
<?php if ($course->status == Course::STATUS_UNCHECK || $course->status == Course::STATUS_FAILED) { ?> <?php if ($sourceEditable) { ?>
<div class="cls-part"> <div class="cls-part">
<div class="tit">更换视频 <span class="text-info" style="font-size:12px;">不选择则继续使用现有视频</span></div> <div class="tit">更换视频 <span class="text-info" style="font-size:12px;">不选择则继续使用现有视频</span></div>
<video-upload uptoken="<?=$videoToken?>" text="保留原视频或选择要更换的视频"></video-upload> <video-upload uptoken="<?=$videoToken?>" text="保留原视频或选择要更换的视频"></video-upload>
...@@ -71,7 +73,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css'); ...@@ -71,7 +73,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
<div class="checkbox rules-set m-l-20 fl"> <div class="checkbox rules-set m-l-20 fl">
<label class="clearfix"> <label class="clearfix">
<span>免费试看</span> <input type="text" name="free_time" class="input-r-control text-center" value="<?=$course->free_time?>"> <span>分钟</span> <span>免费试看</span> <input type="text" name="free_time" class="input-r-control text-center" value="<?=$course->free_time?>"<?php if (!$sourceEditable) {?> disabled<?php }?>> <span>分钟</span>
</label> </label>
</div> </div>
</div> </div>
......
...@@ -41,7 +41,7 @@ var vm = new Vue({ ...@@ -41,7 +41,7 @@ var vm = new Vue({
self.previewKey = data.uuid; self.previewKey = data.uuid;
}); });
var opt = validateOption.generateOption(form); var opt = validateOption.generateOption(form, true);
$.extend(opt, { $.extend(opt, {
//debug: true, //debug: true,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Created by pader on 2016/10/31. * Created by pader on 2016/10/31.
*/ */
module.exports = { module.exports = {
generateOption: function(form) { generateOption: function(form, create) {
return { return {
ignore: "", ignore: "",
rules: { rules: {
...@@ -46,7 +46,7 @@ module.exports = { ...@@ -46,7 +46,7 @@ module.exports = {
var org = element.get(0); var org = element.get(0);
var to = null; var to = null;
if (org == form.vuid) { if (create && org == form.vuid) {
to = $(".upload-video-btn").get(0); to = $(".upload-video-btn").get(0);
} else if (org == form.preview) { } else if (org == form.preview) {
to = $(".upload-video-screen").get(0); to = $(".upload-video-screen").get(0);
......
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