Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions apiserver/plane/api/serializers/cycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@

class CycleWriteSerializer(BaseSerializer):

def validate(self, data):
if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None):
raise serializers.ValidationError("Start date cannot exceed end date")
return data

class Meta:
model = Cycle
fields = "__all__"
Expand All @@ -35,6 +40,11 @@ class CycleSerializer(BaseSerializer):
started_estimates = serializers.IntegerField(read_only=True)
workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
project_detail = ProjectLiteSerializer(read_only=True, source="project")

def validate(self, data):
if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None):
raise serializers.ValidationError("Start date cannot exceed end date")
return data

def get_assignees(self, obj):
members = [
Expand Down
5 changes: 5 additions & 0 deletions apiserver/plane/api/serializers/module.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ class Meta:
"updated_at",
]

def validate(self, data):
if data.get("start_date", None) is not None and data.get("target_date", None) is not None and data.get("start_date", None) > data.get("target_date", None):
raise serializers.ValidationError("Start date cannot exceed target date")
return data

def create(self, validated_data):
members = validated_data.pop("members_list", None)

Expand Down
6 changes: 3 additions & 3 deletions apps/app/constants/workspace.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// services images
import GithubLogo from "public/services/github.png";
import JiraLogo from "public/services/jira.png";
import CSVLogo from "public/services/csv.png";
import ExcelLogo from "public/services/excel.png";
import JSONLogo from "public/services/json.png";
import CSVLogo from "public/services/csv.svg";
import ExcelLogo from "public/services/excel.svg";
import JSONLogo from "public/services/json.svg";

export const ROLE = {
5: "Guest",
Expand Down
Binary file removed apps/app/public/services/csv.png
Binary file not shown.
12 changes: 12 additions & 0 deletions apps/app/public/services/csv.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/app/public/services/excel.png
Binary file not shown.
11 changes: 11 additions & 0 deletions apps/app/public/services/excel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/app/public/services/json.png
Binary file not shown.
12 changes: 12 additions & 0 deletions apps/app/public/services/json.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.