ching/dsite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: ching:vr2022-02-13a
Branches Tags
ching:master
ching:feature/ingredient-summary-2022-02-05
ching:develop
ching:vr20220205
ching:vr2022-02-13a
ching:r2022-02-13
..
compare: ching:master
Branches Tags
ching:feature/ingredient-summary-2022-02-05
ching:develop
ching:master
ching:vr20220205
ching:vr2022-02-13a
ching:r2022-02-13

1 Commits
vr2022-02- ... master

Author SHA1 Message Date
Ching
8e6c37198c Merge branch 'release/r20220205' 2022-02-25 01:22:12 +08:00
2 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
frontend/src/components/recipe-mobile/recipe-edit.vue
View File

@ -384,9 +384,7 @@ export default {
message: '创建成功', message: '创建成功',
forbidClick: true, forbidClick: true,
duration: 800, duration: 800,
}), })
(this.ingredient_name = null),
(this.ingredient_unit = null)
) )
); );

4
recipe/views.py
View File

@ -18,7 +18,7 @@ class RecipeAPI(viewsets.ModelViewSet):
# authentication.SessionAuthentication, # authentication.SessionAuthentication,
# authentication.BasicAuthentication) # authentication.BasicAuthentication)
# permission_classes = (permissions.IsAuthenticated,) # permission_classes = (permissions.IsAuthenticated,)
queryset = recipe.models.Recipe.objects.order_by('-id') queryset = recipe.models.Recipe.objects.all()
serializer_class = recipe.serializers.RecipeSerializer serializer_class = recipe.serializers.RecipeSerializer
def perform_destroy(self, instance): def perform_destroy(self, instance):
@ -54,7 +54,7 @@ class RecipeAPI(viewsets.ModelViewSet):
return super().perform_update(serializer) return super().perform_update(serializer)
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
self.queryset = self.queryset.exclude(status=const.RECIPE_STATUS_DELETED) self.queryset = recipe.models.Recipe.objects.exclude(status=const.RECIPE_STATUS_DELETED)
return super().list(request, *args, **kwargs) return super().list(request, *args, **kwargs)
filterset_fields = { filterset_fields = {