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.

Sign up for GitHub

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

Jump to bottom

2556 wrong dialog text #2572

Merged
merged 2 commits into from
Aug 10, 2023
Merged

2556 wrong dialog text #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22eb3e
change workflow-dialog text
Elblinator Jul 27, 2023
ff99371
adjust code for promptservice.open()
Elblinator Jul 27, 2023
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
3 changes: 2 additions & 1 deletion ...ments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,8 @@ export class AssignmentDetailComponent extends BaseMeetingComponent implements O
*/
public async onDeleteAssignmentButton(): Promise<void> {
const title = this.translate.instant(`Are you sure you want to delete this election?`);
if (await this.promptService.open(title, this.assignment.getTitle())) {
const content = this.assignment.getTitle();
if (await this.promptService.open(title, content)) {
this.assignmentRepo
.delete(this.assignment)
.then(() => this.router.navigate([this.activeMeetingId, `assignments`]));
Expand Down
3 changes: 2 additions & 1 deletion ...es/chat/pages/chat-group-list/components/chat-group-detail/chat-group-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ export class ChatGroupDetailComponent extends BaseMeetingComponent implements On

public async clearChatGroup(chatGroup: ViewChatGroup): Promise<void> {
const title = this.translate.instant(`Are you sure you want to clear all messages in this chat?`);
if (await this.promptService.open(title, chatGroup.name)) {
const content = chatGroup.name;
if (await this.promptService.open(title, content)) {
await this.repo.clear(chatGroup).catch(this.raiseError);
this.triggerUpdateView();
}
Expand Down
13 changes: 6 additions & 7 deletions ...ngs/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,14 +534,13 @@ Note: Does not affect the visibility of change recommendations.`
return (<any>state)[perm.selector];
}

private deleteWorkflowState(state: ViewMotionState): void {
const content = this.translate.instant(`Delete`) + ` ${state.name}?`;
private async deleteWorkflowState(state: ViewMotionState): Promise<void> {
const title = this.translate.instant(`Are you sure you want to delete this state?`);
const content = `${state.name}`;

this.promptService.open(`Are you sure`, content).then(promptResult => {
if (promptResult) {
this.handleRequest(this.stateRepo.delete(state));
}
});
if (await this.promptService.open(title, content)) {
this.handleRequest(this.stateRepo.delete(state));
}
}

private updateWorkflowStateName(name: string, state: ViewMotionState): void {
Expand Down
3 changes: 2 additions & 1 deletion ...ectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ export class ProjectorDetailComponent extends BaseMeetingComponent implements On
*/
public async onDeleteProjectorButton(): Promise<void> {
const title = this.translate.instant(`Are you sure you want to delete this projector?`);
if (this.projector && (await this.promptService.open(title, this.projector.name))) {
const content = this.projector.name;
if (this.projector && (await this.promptService.open(title, content))) {
this.repo.delete(this.projector);
}
}
Expand Down
3 changes: 2 additions & 1 deletion .../modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ export class ProjectorListEntryComponent {
*/
public async onDeleteButton(): Promise<void> {
const title = this.translate.instant(`Are you sure you want to delete this projector?`);
if (await this.promptService.open(title, this.projector.name)) {
const content = this.projector.name;
if (await this.promptService.open(title, content)) {
this.repo.delete(this.projector);
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ export class OrganizationTagListComponent extends BaseListViewComponent<ViewOrga
}

public async deleteOrganizationTags(...orgaTags: ViewOrganizationTag[]): Promise<void> {
const dialogTitle =
const title =
orgaTags.length === 1
? this.translate.instant(`Are you sure you want to delete this tag?`)
: this.translate.instant(`Are you sure you want to delete all selected tags?`);
const dialogSubtitle = orgaTags.length === 1 ? orgaTags[0].name : ``;
if (await this.promptService.open(dialogTitle, dialogSubtitle)) {
const content = orgaTags.length === 1 ? orgaTags[0].name : ``;
if (await this.promptService.open(title, content)) {
await this.repo.delete(...orgaTags);
}
}
Expand Down