From 23290cd612041ff1bb2cc2663a5f7adaa1e9ad56 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 14 Sep 2017 15:09:05 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- courses/new_view.py | 72 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 courses/new_view.py diff --git a/courses/new_view.py b/courses/new_view.py new file mode 100644 index 0000000..b331557 --- /dev/null +++ b/courses/new_view.py @@ -0,0 +1,72 @@ +from rest_framework.views import APIView +from rest_framework.renderers import JSONRenderer +from rest_framework.response import Response +from courses.models import Course, MaterialDirection, CourseTheme, Lesson +from courses.serializers import CourseTreeSerializer, CourseDetailSerializer, CourseListSerializer,\ + ThemeSerializer, LessonSerializer +from finance.models import Bill + + +class DirectionListView(APIView): + renderer_classes = (JSONRenderer,) + status_code = 200 + + def get(self, request): + return Response([direction.title for direction in MaterialDirection.objects.all()], self.status_code) + + +class TreeView(APIView): + renderer_classes = (JSONRenderer,) + status_code = 200 + + @staticmethod + def post(request): + print(request) + return Response(status=204) + + def get(self, request, id): + return Response(CourseTreeSerializer(Course.objects.get(id=id)).data, self.status_code) + + +class ThemeDetailView(APIView): + renderer_classes = (JSONRenderer,) + status_code = 200 + + def get(self, request, id): + return Response(ThemeSerializer(CourseTheme.objects.get(id=id)).data, self.status_code) + + +class LessonDetailView(APIView): + renderer_classes = (JSONRenderer,) + status_code = 200 + + def get(self, request, id): + return Response(LessonSerializer(Lesson.objects.get(id=id)).data, self.status_code) + + +class CourseDetailView(APIView): + renderer_classes = (JSONRenderer,) + status_code = 200 + + def get(self, request, id): + return Response(CourseDetailSerializer(Course.objects.get(id=id)).data, self.status_code) + + +class CourseListView(APIView): + renderer_classes = (JSONRenderer,) + status_code = 200 + + def get(self, request): + if not request.GET.get('staff', 'true') == 'false': + return Response([CourseListSerializer(i).data for i in Course.objects.all()], self.status_code) + + res = [] + for course in Course.objects.all(): + if course.public: + course_serialize = CourseListSerializer(course).data + course_serialize['is_mine'] = False + if request.user.is_authenticated() and Bill.objects.filter(service__course=course, user=request.user, status='F').exists(): + course_serialize['is_mine'] = True + res.append(course_serialize) + + return Response(res, self.status_code) \ No newline at end of file From 57c24a71eb8b000eeb14e5fd6c363bb34838ff3b Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 26 Jan 2018 13:11:45 +0300 Subject: [PATCH 2/3] fix --- journals/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/journals/models.py b/journals/models.py index d033516..8292287 100755 --- a/journals/models.py +++ b/journals/models.py @@ -785,7 +785,7 @@ class HomeworkJ(models.Model): elif _type == 'E': obj = ExamJ - j = obj.objects.get_or_create(material=_next, student=self.student) + j, _c = obj.objects.get_or_create(material=_next, student=self.student) if self.success: j.open_material() return {'button': search_in_collection(BUTTON_TYPE, From 543eff28ea0b5413f4cb0754cc2b2a094f1a2b0e Mon Sep 17 00:00:00 2001 From: Marat Date: Thu, 15 Feb 2018 19:31:10 +0000 Subject: [PATCH 3/3] Add new file --- Envoy.blade.php | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 Envoy.blade.php diff --git a/Envoy.blade.php b/Envoy.blade.php new file mode 100644 index 0000000..db4f6be --- /dev/null +++ b/Envoy.blade.php @@ -0,0 +1,40 @@ +@servers(['localhost' => 'deployer@192.168.0.13']) + +@setup + $repository = 'ssh://git@g.skillbox.ru:22004/kor_a_m/lms-front.git'; + $releases_dir = '/www/site/back_go.skillbox.ru/releases'; + $app_dir = '/www/site/back_go.skillbox.ru/'; + $release = date('YmdHis'); + $new_release_dir = $releases_dir .'/'. $release . '_' . $branch; +@endsetup + +@story('deploy', ['on' => 'localhost']) + clone_repository + update_symlinks + deployment_option_cleanup +@endstory + +@task('clone_repository', ['on' => 'localhost']) +echo '>> Клонируем репозиторий' + +echo '{{ $new_release_dir }}' +[ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }} +@if ($branch) + git clone -b {{ $branch }} {{ $repository }} {{ $new_release_dir }} +@endif +@endtask + +@task('update_symlinks', ['on' => 'localhost']) +@if ($branch) +echo '>> Создаем симлинк на папку текущего релиза' +ln -nfs {{ $new_release_dir }} {{ $app_dir }}/current_{{ $branch }} +@endif +@endtask + +@task('deployment_option_cleanup') + cd {{ $releases_dir }} + @if ( isset($cleanup) && $cleanup ) + find . -maxdepth 1 -name "20*{{ $branch }}" -mmin +30 | head -n 3 | xargs rm -Rf + echo "Cleaned up old deployments" + @endif +@endtask \ No newline at end of file