Skip to content

Commit

Permalink
Merge pull request #1948 from makeplane/stage-release
Browse files Browse the repository at this point in the history
Promot: Stage Release to Production
  • Loading branch information
sriramveeraghanta authored Aug 23, 2023
2 parents 2f5bd58 + b75473a commit 9d39520
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 3 deletions.
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.

3 comments on commit 9d39520

@vercel
Copy link

@vercel vercel bot commented on 9d39520 Aug 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

plane – ./apps/app

plane-plane.vercel.app
plane-git-master-plane.vercel.app
plane-theta.vercel.app
app.plane.so

@vercel
Copy link

@vercel vercel bot commented on 9d39520 Aug 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

plane-sh-dev – ./apps/space

plane-space-dev.vercel.app
plane-sh-dev-git-master-plane.vercel.app
plane-sh-dev-plane.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 9d39520 Aug 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

plane-sh – ./apps/space

plane-sh-plane.vercel.app
plane-deploy.vercel.app
plane.sh
plane-sh-git-master-plane.vercel.app

Please sign in to comment.