File tree 2 files changed +9
-3
lines changed
frontend/express/public/javascripts/countly
plugins/plugins/frontend/public/javascripts
2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -1227,8 +1227,8 @@ var AppRouter = Backbone.Router.extend({
1227
1227
else if ( ( countlyGlobal . security . password_expiration > 0 ) &&
1228
1228
( countlyGlobal . member . password_changed + countlyGlobal . security . password_expiration * 24 * 60 * 60 < new Date ( ) . getTime ( ) / 1000 ) &&
1229
1229
( ! countlyGlobal . ssr ) ) {
1230
- if ( Backbone . history . fragment !== "/manage/user -settings/reset" ) {
1231
- this . navigate ( "/manage/user -settings/reset" , true ) ;
1230
+ if ( Backbone . history . fragment !== "/account -settings/reset" ) {
1231
+ this . navigate ( "/account -settings/reset" , true ) ;
1232
1232
}
1233
1233
else {
1234
1234
viewName . render ( ) ;
Original file line number Diff line number Diff line change 556
556
password : ""
557
557
} ,
558
558
changePassword : {
559
- showDialog : false ,
559
+ showDialog : this . $route . params && this . $route . params . reset || false ,
560
560
title : CV . i18n ( "configs.change-password" ) ,
561
561
saveButtonLabel : CV . i18n ( "configs.change-password" ) ,
562
562
cancelButtonLabel : CV . i18n ( "configs.cancel" ) ,
1101
1101
this . renderWhenReady ( getAccountView ( ) ) ;
1102
1102
} ) ;
1103
1103
1104
+ app . route ( '/account-settings/reset' , 'account-settings' , function ( ) {
1105
+ var view = getAccountView ( ) ;
1106
+ view . params = { reset : true } ;
1107
+ this . renderWhenReady ( view ) ;
1108
+ } ) ;
1109
+
1104
1110
$ ( document ) . ready ( function ( ) {
1105
1111
if ( countlyAuth . validateGlobalAdmin ( ) ) {
1106
1112
if ( countlyGlobal . COUNTLY_CONTAINER !== 'frontend' ) {
You can’t perform that action at this time.
0 commit comments