Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change file to files on comment entities #690

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion javascript/draft_comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function DraftComment() {
addPropertyTo(this, 'id');
addPropertyTo(this, 'draft', Draft);
addPropertyTo(this, 'user', User);
addPropertyTo(this, 'file', MerchiFile);
addPropertyTo(this, 'files', MerchiFile);
addPropertyTo(this, 'notifications', Notification);
addPropertyTo(this, 'job', Job);
addPropertyTo(this, 'date');
Expand Down
2 changes: 1 addition & 1 deletion javascript/job_comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function JobComment() {
addPropertyTo(this, 'id');
addPropertyTo(this, 'job', Job);
addPropertyTo(this, 'user', User);
addPropertyTo(this, 'file', MerchiFile);
addPropertyTo(this, 'files', MerchiFile);
addPropertyTo(this, 'notifications', Notification);
addPropertyTo(this, 'date');
addPropertyTo(this, 'text');
Expand Down
2 changes: 1 addition & 1 deletion javascript/production_comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export function ProductionComment() {

addPropertyTo(this, 'id');
addPropertyTo(this, 'user', User);
addPropertyTo(this, 'file', MerchiFile);
addPropertyTo(this, 'files', MerchiFile);
addPropertyTo(this, 'notifications', Notification);
addPropertyTo(this, 'assignment', Assignment);
addPropertyTo(this, 'date');
Expand Down
2 changes: 1 addition & 1 deletion python/draft_comments.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class DraftComment(sdk.python.entities.Entity):
json_name = 'draft_comment'

id = Property(int)
file = Property(File)
files = Property(File)
urgency = Property(int)
subject = Property(str)
date = Property(datetime.datetime)
Expand Down
2 changes: 1 addition & 1 deletion python/job_comments.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class JobComment(sdk.python.entities.Entity):
json_name = 'job_comment'

id = Property(int)
file = Property(File)
files = Property(File)
date = Property(datetime.datetime)
text = Property(str)
urgency = Property(int)
Expand Down
2 changes: 1 addition & 1 deletion python/production_comments.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ProductionComment(sdk.python.entities.Entity):
json_name = 'production_comment'

id = Property(int)
file = Property(File)
files = Property(File)
date = Property(datetime.datetime)
text = Property(str)
urgency = Property(int)
Expand Down
4 changes: 2 additions & 2 deletions typescript/src/entities/draft_comment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
@DraftComment.property()
public user?: User;

@DraftComment.property({type: MerchiFile})
public file?: MerchiFile | null;
@DraftComment.property({arrayType: "MerchiFile"})

Check failure on line 40 in typescript/src/entities/draft_comment.ts

View workflow job for this annotation

GitHub Actions / Check Typescript (16)

Strings must use singlequote
public files?: MerchiFile[];

@DraftComment.property({arrayType: 'User'})
public forwards?: User[];
Expand Down
4 changes: 2 additions & 2 deletions typescript/src/entities/job_comment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
@JobComment.property()
public urgency?: number;

@JobComment.property({type: Date})
public file?: MerchiFile | null;
@JobComment.property({arrayType: "MerchiFile"})

Check failure on line 36 in typescript/src/entities/job_comment.ts

View workflow job for this annotation

GitHub Actions / Check Typescript (16)

Strings must use singlequote
public files?: MerchiFile[];

@JobComment.property({arrayType: 'User'})
public forwards?: User[];
Expand Down
4 changes: 2 additions & 2 deletions typescript/src/entities/production_comment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
@ProductionComment.property()
public sendEmail?: boolean;

@ProductionComment.property({type: MerchiFile})
public file?: MerchiFile | null;
@ProductionComment.property({arrayType: "MerchiFile"})

Check failure on line 36 in typescript/src/entities/production_comment.ts

View workflow job for this annotation

GitHub Actions / Check Typescript (16)

Strings must use singlequote
public files?: MerchiFile[];

@ProductionComment.property()
public user?: User;
Expand Down
Loading