diff --git a/mocks/db.json b/mocks/db.json index c1bf054c..ef57cf5a 100644 --- a/mocks/db.json +++ b/mocks/db.json @@ -6,7 +6,7 @@ "polls": [ { "id": 1, - "slug": "picnic", + "custom_url": "picnic", "configuration": { "id": 1, "isAboutDate": true, @@ -24,7 +24,7 @@ }, { "id": 2, - "slug": "vacances", + "custom_url": "vacances", "configuration": { "id": 2, "isAboutDate": true, diff --git a/mocks/old-stuff/config/PollConfig.ts b/mocks/old-stuff/config/PollConfig.ts index b45b3573..99ceac24 100644 --- a/mocks/old-stuff/config/PollConfig.ts +++ b/mocks/old-stuff/config/PollConfig.ts @@ -54,7 +54,7 @@ export class PollConfig { currentPoll; // current poll selected with createPoll or getPoll of ConfigService passwordAccess = 0; password = ''; - customUrl = ''; // custom slug in the url, must be unique + customUrl = ''; // custom custom_url in the url, must be unique customUrlIsUnique = null; // given by the backend urlSlugPublic = null; urlPublic = environment.production ? '' : document.location.href + '/poll/id/4'; diff --git a/mocks/old-stuff/old-stuff-routing.module.ts b/mocks/old-stuff/old-stuff-routing.module.ts index 8a84fe53..a51f91e5 100644 --- a/mocks/old-stuff/old-stuff-routing.module.ts +++ b/mocks/old-stuff/old-stuff-routing.module.ts @@ -33,7 +33,7 @@ const routes: Routes = [ { path: 'step/end', component: EndConfirmationComponent }, { path: 'graphic/:poll', component: PollGraphicComponent }, { path: 'vote/poll/id/:id', component: PollDisplayComponent }, - { path: 'vote/poll/slug/:slug', component: PollDisplayComponent }, + { path: 'vote/poll/custom_url/:custom_url', component: PollDisplayComponent }, { path: 'votingchoice', component: VotingChoiceComponent }, { path: 'voting', component: VotingComponent }, ]; diff --git a/mocks/old-stuff/pages/admin/admin.component.ts b/mocks/old-stuff/pages/admin/admin.component.ts index cb56c601..5e0c1fd3 100644 --- a/mocks/old-stuff/pages/admin/admin.component.ts +++ b/mocks/old-stuff/pages/admin/admin.component.ts @@ -39,7 +39,7 @@ export class AdminComponent implements OnInit { }); } - // fetch poll with its ID or slug. + // fetch poll with its ID or custom_url. fetchPoll() { const token = this.tokenForAdministration; const headers = this.utils.makeHeaders({ token: token }); diff --git a/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts index 768b8686..61a98bbe 100644 --- a/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts +++ b/mocks/old-stuff/pages/poll/poll-display/poll-display.component.ts @@ -28,7 +28,7 @@ export class PollDisplayComponent extends BaseComponent implements OnInit { ngOnInit(): void {} - // fetch poll with its ID or slug. + // fetch poll with its ID or custom_url. fetchPoll() { const id = this.activeRoute.snapshot.params.poll; const pollSlug = this.activeRoute.snapshot.params.pollSlug; diff --git a/mocks/old-stuff/pages/visibility/visibility.component.html b/mocks/old-stuff/pages/visibility/visibility.component.html index 1244f37e..d57e4f74 100644 --- a/mocks/old-stuff/pages/visibility/visibility.component.html +++ b/mocks/old-stuff/pages/visibility/visibility.component.html @@ -102,8 +102,8 @@ {{ 'visibility.access_instructions' | translate }}
{{ 'creation.choose_title' | translate }}
-+ - + +
+ + +