Start refinement of CREST utilities:
* Add preference page which gives option of implicit grant or user client details * Improve CREST service * Changes in pycrest which make things a little easier
This commit is contained in:
@@ -1 +1 @@
|
||||
__all__ = ["pyfaGeneralPreferences","pyfaHTMLExportPreferences","pyfaUpdatePreferences","pyfaNetworkPreferences"]
|
||||
__all__ = ["pyfaGeneralPreferences","pyfaHTMLExportPreferences","pyfaUpdatePreferences","pyfaNetworkPreferences","pyfaCrestPreferences"]
|
||||
|
||||
@@ -145,7 +145,6 @@ class CrestLogin(wx.Frame):
|
||||
|
||||
self.mainFrame = parent
|
||||
sCrest = service.Crest.getInstance()
|
||||
|
||||
mainSizer = wx.BoxSizer( wx.HORIZONTAL )
|
||||
self.loginBtn = wx.Button( self, wx.ID_ANY, u"Login via SSO", wx.DefaultPosition, wx.DefaultSize, 5 )
|
||||
mainSizer.Add( self.loginBtn, 0, wx.ALL, 5 )
|
||||
|
||||
@@ -55,7 +55,6 @@ from gui.utils.clipboard import toClipboard, fromClipboard
|
||||
from gui.fleetBrowser import FleetBrowser
|
||||
from gui.updateDialog import UpdateDialog
|
||||
from gui.builtinViews import *
|
||||
|
||||
from time import gmtime, strftime
|
||||
|
||||
#dummy panel(no paint no erasebk)
|
||||
@@ -491,8 +490,13 @@ class MainFrame(wx.Frame):
|
||||
dlg.Show()
|
||||
|
||||
def ssoLogin(self, event):
|
||||
dlg=CrestLogin(self)
|
||||
dlg.Show()
|
||||
sCrest = service.Crest.getInstance()
|
||||
if sCrest.settings.get('mode') == 0: # Implicit, go directly to login
|
||||
uri = sCrest.startServer()
|
||||
wx.LaunchDefaultBrowser(uri)
|
||||
else:
|
||||
dlg=CrestLogin(self)
|
||||
dlg.Show()
|
||||
|
||||
def exportToEve(self, event):
|
||||
dlg=ExportToEve(self)
|
||||
|
||||
Reference in New Issue
Block a user