diff --git a/client/src/app/site/base/base-controller.ts b/client/src/app/site/base/base-controller.ts index 9301842d6a..b15f13bca4 100644 --- a/client/src/app/site/base/base-controller.ts +++ b/client/src/app/site/base/base-controller.ts @@ -14,6 +14,10 @@ export abstract class BaseController, diff --git a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.ts b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.ts index 726e5f7e4f..1913aa890e 100644 --- a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.ts @@ -14,7 +14,6 @@ import { SearchDeletedModelsPresenterService } from 'src/app/gateways/presenter/ import { AssignmentRepositoryService } from 'src/app/gateways/repositories/assignments/assignment-repository.service'; import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; import { MotionRepositoryService } from 'src/app/gateways/repositories/motions'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; import { collectionIdFromFqid, fqidFromCollectionAndId, @@ -29,6 +28,7 @@ import { OperatorService } from 'src/app/site/services/operator.service'; import { ViewModelStoreService } from 'src/app/site/services/view-model-store.service'; import { ViewMotionState } from '../../../motions'; +import { ParticipantControllerService } from '../../../participants/services/common/participant-controller.service'; import { Position } from '../../definitions'; import { HistoryService } from '../../services/history.service'; @@ -93,7 +93,7 @@ export class HistoryListComponent extends BaseMeetingComponent implements OnInit public get modelPlaceholder(): string { const value = this.modelSelectForm.controls[`collection`].value; - if (!value) { + if (!value || !this.modelsRepoMap[value]) { return `-`; } else { return this.modelsRepoMap[value].getVerboseName(); @@ -116,7 +116,7 @@ export class HistoryListComponent extends BaseMeetingComponent implements OnInit private historyService: HistoryService, private motionRepo: MotionRepositoryService, private assignmentRepo: AssignmentRepositoryService, - private userRepo: UserRepositoryService, + private userRepo: ParticipantControllerService, private collectionMapperService: CollectionMapperService ) { super(componentServiceCollector, translate); @@ -256,7 +256,6 @@ export class HistoryListComponent extends BaseMeetingComponent implements OnInit * Serves as an entry point for the time travel routine */ public async onClickRow(position: Position): Promise { - console.log(`click on row`, position, this.operator.hasOrganizationPermissions(OML.superadmin)); if (!this.operator.hasOrganizationPermissions(OML.superadmin)) { return; } @@ -264,7 +263,6 @@ export class HistoryListComponent extends BaseMeetingComponent implements OnInit await this.historyService.enterHistoryMode(this.currentFqid, position); const [collection, id] = collectionIdFromFqid(this.currentFqid); const element = this.viewModelStore.get(collection, id); - console.log(`go to element:`, element); if (element && isDetailNavigable(element)) { this.router.navigate([element.getDetailStateUrl()]); } else { diff --git a/client/src/app/site/pages/meetings/pages/history/history.module.ts b/client/src/app/site/pages/meetings/pages/history/history.module.ts index bb4eca971c..af0208d21a 100644 --- a/client/src/app/site/pages/meetings/pages/history/history.module.ts +++ b/client/src/app/site/pages/meetings/pages/history/history.module.ts @@ -14,6 +14,7 @@ import { HeadBarModule } from 'src/app/ui/modules/head-bar'; import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; import { PipesModule } from 'src/app/ui/pipes'; +import { ParticipantCommonServiceModule } from '../participants/services/common/participant-common-service.module'; import { HistoryBannerComponent } from './components/history-banner/history-banner.component'; import { HistoryListComponent } from './components/history-list/history-list.component'; import { HistoryMainComponent } from './components/history-main/history-main.component'; @@ -39,6 +40,7 @@ import { HistoryRoutingModule } from './history-routing.module'; OpenSlidesTranslationModule.forChild(), HeadBarModule, SearchSelectorModule, + ParticipantCommonServiceModule, PipesModule ], declarations: [HistoryListComponent, HistoryMainComponent, HistoryBannerComponent] diff --git a/client/src/app/site/pages/meetings/view-models/view-user.ts b/client/src/app/site/pages/meetings/view-models/view-user.ts index d0cd3f7f82..9c5a761eca 100644 --- a/client/src/app/site/pages/meetings/view-models/view-user.ts +++ b/client/src/app/site/pages/meetings/view-models/view-user.ts @@ -255,7 +255,11 @@ export class ViewUser extends BaseViewModel /* implements Searchable */ { // ### block end. public override getDetailStateUrl(): string { - return `/${this.getActiveMeetingId()}/users/${this.id}`; + if (this.getEnsuredActiveMeetingId && this.getEnsuredActiveMeetingId()) { + return `/${this.getEnsuredActiveMeetingId()}/participants/${this.id}`; + } + + return `/accounts/${this.id}`; } public canVoteFor(user: ViewUser | null): boolean {