ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/tags: fix URL redirections

Browse source 
User controller didn't need intervention but I refactored it to match
tag controller anyway.
This commit is contained in:
rr- 2016-08-28 23:55:45 +02:00
parent 997eb3de63
commit acd989cabb
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/js/controllers/tag_controller.js
View file

@ -22,7 +22,7 @@ class TagController {
topNavigation.setTitle('Tag #' + tag.names[0]); topNavigation.setTitle('Tag #' + tag.names[0]);
this._name = ctx.parameters.name; this._name = ctx.parameters.name;
tag.addEventListener('change', e => this._evtSaved(e)); tag.addEventListener('change', e => this._evtSaved(e, section));
const categories = {}; const categories = {};
for (let category of tags.getAllCategories()) { for (let category of tags.getAllCategories()) {
@ -57,10 +57,11 @@ class TagController {
misc.enableExitConfirmation(); misc.enableExitConfirmation();
} }
_evtSaved(e) { _evtSaved(e, section) {
misc.disableExitConfirmation(); misc.disableExitConfirmation();
if (this._name !== e.detail.tag.names[0]) { if (this._name !== e.detail.tag.names[0]) {
router.replace('/tag/' + e.detail.tag.names[0], null, false); router.replace(
'/tag/' + e.detail.tag.names[0] + '/' + section, null, false);
} }
} }
@ -97,6 +98,8 @@ class TagController {
e.detail.tag.merge(e.detail.targetTagName).then(() => { e.detail.tag.merge(e.detail.targetTagName).then(() => {
this._view.showSuccess('Tag merged.'); this._view.showSuccess('Tag merged.');
this._view.enableForm(); this._view.enableForm();
router.replace(
'/tag/' + e.detail.targetTagName + '/merge', null, false);
}, errorMessage => { }, errorMessage => {
this._view.showError(errorMessage); this._view.showError(errorMessage);
this._view.enableForm(); this._view.enableForm();

6
client/js/controllers/user_controller.js
View file

@ -26,7 +26,7 @@ class UserController {
const infix = isLoggedIn ? 'self' : 'any'; const infix = isLoggedIn ? 'self' : 'any';
this._name = userName; this._name = userName;
user.addEventListener('change', e => this._evtSaved(e)); user.addEventListener('change', e => this._evtSaved(e, section));
const myRankIndex = api.user ? const myRankIndex = api.user ?
api.allRanks.indexOf(api.user.rank) : api.allRanks.indexOf(api.user.rank) :
@ -73,11 +73,11 @@ class UserController {
misc.enableExitConfirmation(); misc.enableExitConfirmation();
} }
_evtSaved(e) { _evtSaved(e, section) {
misc.disableExitConfirmation(); misc.disableExitConfirmation();
if (this._name !== e.detail.user.name) { if (this._name !== e.detail.user.name) {
router.replace( router.replace(
'/user/' + e.detail.user.name + '/edit', null, false); '/user/' + e.detail.user.name + '/' + section, null, false);
} }
} }