Location switch bug fix

[ryanmitchell]

Came across this random bug where the location change wouldn't stick in Chrome... the fix ended up being to clear the session before adding to it.

[ryanmitchell]

In fact, this only works if you're a superadmin. If youre not, then it still fails to let you switch. The right session var is setup, but on page reload it resets back. Any guidance gratefully received!

[ryanmitchell]

Ok, want to ask before I commit changes...

TastyIgniter/app/admin/classes/Location.php

Line 111 in 5bcbeed

return $this->getAuth()->locations()->contains(function ($model) use ($id) {

Should this not be

return !$this->getAuth()->locations()->contains(function ($model) use ($id) {
            return $model->location_id === $id;
        });

TastyIgniter/app/admin/classes/Location.php

Line 62 in 5bcbeed

return $this->getAuth()->locations()->isNotEmpty();

Should this not be isEmpty()

Feels like the functions do the reverse of what their name suggests?

[ryanmitchell]

Hmm actually, thats not right either.

I think this:

TastyIgniter/app/admin/classes/Location.php

Line 32 in 5bcbeed

if ((!$id AND $this->hasRestriction()) OR $this->isNotAttachedToAuth($id))

needs to become:
if ((!$id AND $this->hasRestriction()) OR !$this->hasAccess($id))

[sampoyigi]

Yea the last one works but then breaks as hasLocationAccess expects a model, so maybe rename isNotAttachedToAuth to isAttachedToAuth and add

if ($this->getAuth()->isSuperUser())
     return TRUE;

so we end up with if ((!$id AND $this->hasRestriction()) OR !$this->isAttachedToAuth($id))

the changes to the Menu widgets won't be needed.

[ryanmitchell]

Yep thats perfect. Updated.