Merge branch 'master' into singularity

service/fit.py

@@ -97,7 +97,8 @@ class Fit(object):
             "rackSlots": True,
             "rackLabels": True,
             "compactSkills": True,
-            "showTooltip": True}
+            "showTooltip": True,
+            "showMarketShortcuts": False}
 
         self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
             "pyfaServiceFittingOptions", serviceFittingDefaultOptions)
@@ -893,7 +894,7 @@ class Fit(object):
                     State.ONLINE: State.ACTIVE}  # Just in case
 
     def __getProposedState(self, mod, click, proposedState=None):
-        if mod.slot in (Slot.RIG, Slot.SUBSYSTEM) or mod.isEmpty:
+        if mod.slot is Slot.SUBSYSTEM or mod.isEmpty:
             return State.ONLINE
 
         currState = mod.state

service/prefetch.py

@@ -55,4 +55,4 @@ else:
     # If database does not exist, do not worry about migration. Simply
     # create and set version
     eos.db.saveddata_meta.create_all()
-    eos.db.saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)
+    eos.db.saveddata_engine.execute('PRAGMA user_version = {}'.format(migration.getAppVersion()))