Merge pull request #2435 from dpalou/MOBILE-3459

jleyva · web-flow · commit 384b047272b9 · 2020-07-02T12:30:01.000+02:00
MOBILE-3459 more: Allow disabling QR reader in main menu
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
@@ -67,7 +67,8 @@ export class CoreMainMenuMorePage implements OnDestroy {
         this.updateSiteObserver = eventsProvider.on(CoreEventsProvider.SITE_UPDATED, this.loadSiteInfo.bind(this),
             sitesProvider.getCurrentSiteId());
         this.loadSiteInfo();
-        this.showScanQR = this.utils.canScanQR();
+        this.showScanQR = this.utils.canScanQR() &&
+                !this.sitesProvider.getCurrentSite().isFeatureDisabled('CoreMainMenuDelegate_QrReader');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ export class CoreMainMenuMorePage implements OnDestroy {`
`67`	`67`	`this.updateSiteObserver = eventsProvider.on(CoreEventsProvider.SITE_UPDATED, this.loadSiteInfo.bind(this),`
`68`	`68`	`sitesProvider.getCurrentSiteId());`
`69`	`69`	`this.loadSiteInfo();`
`70`		`- this.showScanQR = this.utils.canScanQR();`
	`70`	`+ this.showScanQR = this.utils.canScanQR() &&`
	`71`	`+ !this.sitesProvider.getCurrentSite().isFeatureDisabled('CoreMainMenuDelegate_QrReader');`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`/**`