Merge branch 'fix-password' into 'dev'
Fix password See merge request framasoft/framadate/funky-framadate-front!25
This commit is contained in:
commit
ce4c3cb000
|
@ -30,11 +30,9 @@ export class AppComponent {
|
||||||
detectCurrentTabOnRouteChange() {
|
detectCurrentTabOnRouteChange() {
|
||||||
this.route.events.subscribe((event: any) => {
|
this.route.events.subscribe((event: any) => {
|
||||||
|
|
||||||
// console.log('event', event);
|
|
||||||
if (event.url) {
|
if (event.url) {
|
||||||
|
|
||||||
const tab = event.url.split('/');
|
const tab = event.url.split('/');
|
||||||
console.log(tab);
|
|
||||||
if (tab && tab[2]) {
|
if (tab && tab[2]) {
|
||||||
this.step = tab[2];
|
this.step = tab[2];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -54,7 +54,6 @@ export class AnswersComponent extends BaseComponent implements OnInit, AfterView
|
||||||
}
|
}
|
||||||
|
|
||||||
navigateOrDelete(event: KeyboardEvent, i) {
|
navigateOrDelete(event: KeyboardEvent, i) {
|
||||||
console.log('event', event);
|
|
||||||
if (event.ctrlKey && event.key == "d") {
|
if (event.ctrlKey && event.key == "d") {
|
||||||
this.config.answers.splice(i, 1)
|
this.config.answers.splice(i, 1)
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,8 +128,7 @@
|
||||||
{{"visibility.access_protect"|translate}}
|
{{"visibility.access_protect"|translate}}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div class="enablepassword" *ngIf="config.passwordAccess">
|
<div class="enablepassword" *ngIf="config.passwordAccess == '1'">
|
||||||
|
|
||||||
<input type="password"
|
<input type="password"
|
||||||
name="password"
|
name="password"
|
||||||
id="password"
|
id="password"
|
||||||
|
|
|
@ -106,7 +106,6 @@ export class ConfigService extends PollConfig {
|
||||||
answers: this.answers,
|
answers: this.answers,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
console.log('jsonConfig', jsonConfig);
|
|
||||||
return jsonConfig
|
return jsonConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,7 +163,6 @@ export class ConfigService extends PollConfig {
|
||||||
.subscribe(res => {
|
.subscribe(res => {
|
||||||
// message: 'Trouvé! Allez voir votre boite email',
|
// message: 'Trouvé! Allez voir votre boite email',
|
||||||
this.myPolls = res;
|
this.myPolls = res;
|
||||||
console.log('res', res);
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.messageService.add({
|
this.messageService.add({
|
||||||
severity: 'success',
|
severity: 'success',
|
||||||
|
@ -253,11 +251,9 @@ export class ConfigService extends PollConfig {
|
||||||
* action of the form
|
* action of the form
|
||||||
*/
|
*/
|
||||||
createPoll() {
|
createPoll() {
|
||||||
console.log('sends the form');
|
|
||||||
// alert('envoi de formulaire pour création de sondage en XHR à faire');
|
// alert('envoi de formulaire pour création de sondage en XHR à faire');
|
||||||
this.http.get(`${this.baseHref}/`, this.makeHeaders())
|
this.http.get(`${this.baseHref}/`, this.makeHeaders())
|
||||||
.subscribe((res) => {
|
.subscribe((res) => {
|
||||||
console.log('res', res);
|
|
||||||
this.createPollFromConfig(this.getPollConfig())
|
this.createPollFromConfig(this.getPollConfig())
|
||||||
},
|
},
|
||||||
this.handleError
|
this.handleError
|
||||||
|
|
Loading…
Reference in New Issue