- {{ partial('course/show_catalog') }}
+
{{ course.details }}
-
{{ course.details }}
+ {{ partial('course/show_catalog') }}
{% if show_tab_packages %}
{% set packages_url = url({'for':'home.course.packages','id':course.id}) %}
diff --git a/app/Http/Home/Views/partials/header.volt b/app/Http/Home/Views/partials/header.volt
index eed37828..9ea1f6db 100644
--- a/app/Http/Home/Views/partials/header.volt
+++ b/app/Http/Home/Views/partials/header.volt
@@ -42,7 +42,7 @@
{% endif %}
{% if auth_user.id > 0 %}
- 创建
+ 发布
- 提问题
- 写文章
diff --git a/app/Repos/Chapter.php b/app/Repos/Chapter.php
index db01204a..57b652cd 100644
--- a/app/Repos/Chapter.php
+++ b/app/Repos/Chapter.php
@@ -78,6 +78,18 @@ class Chapter extends Repository
->execute();
}
+ /**
+ * @param int $id
+ * @return ResultsetInterface|Resultset|ChapterModel[]
+ */
+ public function findLessons($id)
+ {
+ return ChapterModel::query()
+ ->where('parent_id = :parent_id:', ['parent_id' => $id])
+ ->andWhere('deleted = 0')
+ ->execute();
+ }
+
/**
* @param string $fileId
* @return ChapterModel|Model|bool
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index 86fad6c4..0cfe85fd 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -64,7 +64,12 @@ class ConsultCreate extends LogicService
$validator = new ConsultValidator();
$question = $validator->checkQuestion($post['question']);
- $private = $validator->checkPrivateStatus($post['private']);
+
+ $private = 0;
+
+ if (isset($post['private'])) {
+ $private = $validator->checkPrivateStatus($post['private']);
+ }
$validator->checkIfDuplicated($course->id, $user->id, $question);
@@ -101,7 +106,12 @@ class ConsultCreate extends LogicService
$validator = new ConsultValidator();
$question = $validator->checkQuestion($post['question']);
- $private = $validator->checkPrivateStatus($post['private']);
+
+ $private = 0;
+
+ if (isset($post['private'])) {
+ $private = $validator->checkPrivateStatus($post['private']);
+ }
$validator->checkIfDuplicated($course->id, $user->id, $question);
diff --git a/app/Validators/Chapter.php b/app/Validators/Chapter.php
index 1c2fee67..03510a42 100644
--- a/app/Validators/Chapter.php
+++ b/app/Validators/Chapter.php
@@ -205,7 +205,7 @@ class Chapter extends Validator
if ($attrs['word_count'] == 0) {
throw new BadRequestException('chapter.read_not_ready');
}
- } elseif ($chapter->model == CourseModel::MODEL_READ) {
+ } elseif ($chapter->model == CourseModel::MODEL_OFFLINE) {
if ($attrs['start_time'] == 0) {
throw new BadRequestException('chapter.offline_time_empty');
}
diff --git a/app/Validators/Course.php b/app/Validators/Course.php
index eadca9c2..6262b8e2 100644
--- a/app/Validators/Course.php
+++ b/app/Validators/Course.php
@@ -246,29 +246,6 @@ class Course extends Validator
if ($course->teacher_id == 0) {
throw new BadRequestException('course.teacher_not_assigned');
}
-
- $courseRepo = new CourseRepo();
-
- $chapters = $courseRepo->findChapters($course->id);
-
- $totalCount = $publishedCount = 0;
-
- foreach ($chapters as $chapter) {
- if ($chapter->parent_id > 0 && $chapter->published == 1) {
- $publishedCount++;
- }
- if ($chapter->parent_id > 0) {
- $totalCount++;
- }
- }
-
- if ($publishedCount == 0) {
- throw new BadRequestException('course.pub_chapter_not_found');
- }
-
- if ($publishedCount / $totalCount < 0.2) {
- throw new BadRequestException('course.pub_chapter_not_enough');
- }
}
}
diff --git a/app/Validators/CourseUser.php b/app/Validators/CourseUser.php
index b0757b3a..67eb19d6 100644
--- a/app/Validators/CourseUser.php
+++ b/app/Validators/CourseUser.php
@@ -9,6 +9,7 @@ namespace App\Validators;
use App\Exceptions\BadRequest as BadRequestException;
use App\Library\Validators\Common as CommonValidator;
+use App\Models\CourseUser as CourseUserModel;
use App\Repos\CourseUser as CourseUserRepo;
class CourseUser extends Validator
@@ -65,14 +66,14 @@ class CourseUser extends Validator
return strtotime($value);
}
- public function checkIfJoined($courseId, $userId)
+ public function checkIfImported($courseId, $userId)
{
$repo = new CourseUserRepo();
$courseUser = $repo->findCourseStudent($courseId, $userId);
- if ($courseUser) {
- throw new BadRequestException('course_user.has_joined');
+ if ($courseUser && $courseUser->source_type == CourseUserModel::SOURCE_IMPORT) {
+ throw new BadRequestException('course_user.has_imported');
}
}
diff --git a/config/errors.php b/config/errors.php
index acf05cd7..7b48669d 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -184,8 +184,6 @@ $error['course.invalid_refund_expiry'] = '无效的退款期限';
$error['course.invalid_feature_status'] = '无效的推荐状态';
$error['course.invalid_publish_status'] = '无效的发布状态';
$error['course.teacher_not_assigned'] = '尚未指定授课教师';
-$error['course.pub_chapter_not_found'] = '尚未发现已发布的课时';
-$error['course.pub_chapter_not_enough'] = '已发布的课时太少（小于20%）';
/**
* 面授课程相关
@@ -240,7 +238,7 @@ $error['package.invalid_expiry'] = '无效的期限（范围：1~60）';
$error['course_user.not_found'] = '课程学员关系不存在';
$error['course_user.invalid_expiry_time'] = '无效的过期时间';
$error['course_user.review_not_allowed'] = '当前不允许评价课程';
-$error['course_user.has_joined'] = '已经加入过该课程';
+$error['course_user.has_imported'] = '已经加入过该课程';
$error['course_user.has_reviewed'] = '已经评价过该课程';
/**