seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix showing build upgrade message on app startup

This commit is contained in:
Nuwan 2023-03-16 12:26:29 +05:30
parent 8d2e9d6663
commit 76c56612cf
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruby/lib/jam_ruby/models/artifact_update.rb
View File

@ -3,8 +3,17 @@ module JamRuby
DEFAULT_ENVIRONMENT = 'public' DEFAULT_ENVIRONMENT = 'public'
CLIENT_PREFIX = 'JamClient' CLIENT_PREFIX = 'JamClient'
CLIENT_PREFIX_MODERN = 'JamClientModern'
PRODUCTS = ["#{CLIENT_PREFIX}/Win32", "#{CLIENT_PREFIX}/MacOSX", "#{CLIENT_PREFIX}/JamBlaster", "#{CLIENT_PREFIX}/JamBlasterClient"] PRODUCTS = [
"#{CLIENT_PREFIX}/Win32",
"#{CLIENT_PREFIX}/MacOSX",
"#{CLIENT_PREFIX}/JamBlaster",
"#{CLIENT_PREFIX}/JamBlasterClient",
"#{CLIENT_PREFIX_MODERN}/Win32",
"#{CLIENT_PREFIX_MODERN}/MacOSX-Intel",
"#{CLIENT_PREFIX_MODERN}/MacOSX-M1"
]
self.primary_key = 'id' self.primary_key = 'id'
attr_accessible :version, :uri, :sha1, :environment, :product, as: :admin attr_accessible :version, :uri, :sha1, :environment, :product, as: :admin

5
web/app/assets/javascripts/clientUpdate.js
View File

@ -256,7 +256,7 @@
// check if updated is needed // check if updated is needed
async function check() { async function check() {
var os = await context.JK.GetOSAsString(); var os = await context.JK.getDetailedOS();
//os = 'Win32' //os = 'Win32'
// check kill switch before all other logic // check kill switch before all other logic
@ -265,7 +265,8 @@
return; return;
} }
var product = "JamClient" //var product = "JamClient"
var product = "JamClientModern"
var currentVersion = await context.jamClient.ClientUpdateVersion(); var currentVersion = await context.jamClient.ClientUpdateVersion();
if (!forceShow && (currentVersion == null || currentVersion.indexOf("Compiled")) > -1) { if (!forceShow && (currentVersion == null || currentVersion.indexOf("Compiled")) > -1) {