Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't persist current tab when display is locked #7882

Merged
merged 11 commits into from
Oct 11, 2024
+42 −6
Merged

Don't persist current tab when display is locked #7882

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
feccc33
Check if a tabs view object is locked before persisting the default t…
shefalijoshi Oct 10, 2024
95dcf28
Add tests
shefalijoshi Oct 10, 2024
6731ecf
Merge branch 'master' into fix-persistent-tabs-immutable-displays
akhenry Oct 10, 2024
5309b69
Add a check for persistability in addition to locked
shefalijoshi Oct 10, 2024
65b16ce
Merge branch 'fix-persistent-tabs-immutable-displays' of https://gith…
shefalijoshi Oct 10, 2024
0e8b4db
Merge branch 'master' into fix-persistent-tabs-immutable-displays
shefalijoshi Oct 10, 2024
d56ad79
Revert change to check persistability
shefalijoshi Oct 10, 2024
1d9bab8
Fix test
shefalijoshi Oct 10, 2024
c3fb73f
Merge branch 'master' into fix-persistent-tabs-immutable-displays
shefalijoshi Oct 10, 2024
4b7905f
Fixed test that was broken by change in master
akhenry Oct 11, 2024
30913e2
Fix test broken by changes in master
akhenry Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a check for persistability in addition to locked
  • Loading branch information
@shefalijoshi
shefalijoshi committed Oct 10, 2024
commit 5309b697b6b7c93a355f438754f2af2477048ba1
5 changes: 4 additions & 1 deletion src/plugins/tabs/components/TabsComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,10 @@ export default {
},
persistCurrentTabIndex(index) {
//only persist if the domain object is not locked. The object mutate API will deal with whether the object is persistable or not.
if (!this.internalDomainObject.locked) {
if (
this.openmct.objects.isPersistable(this.internalDomainObject.identifier) &&
!this.internalDomainObject.locked
) {
this.openmct.objects.mutate(this.internalDomainObject, 'currentTabIndex', index);
}
},
Expand Down