Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix check if you're up to date in javascript

This commit is contained in:
Neil Lalonde 2013-03-06 10:34:15 -05:00
parent 208575f93d
commit 83f89b5c55
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/models/version_check.js
View File

@ -8,8 +8,8 @@
**/ **/
Discourse.VersionCheck = Discourse.Model.extend({ Discourse.VersionCheck = Discourse.Model.extend({
upToDate: function() { upToDate: function() {
return this.get('missing_versions_count') === 0; return this.get('latest_version') === this.get('installed_version');
}.property('missing_versions_count'), }.property('latest_version', 'installed_version'),
behindByOneVersion: function() { behindByOneVersion: function() {
return this.get('missing_versions_count') === 1; return this.get('missing_versions_count') === 1;

6
lib/discourse_updates.rb
View File

@ -5,7 +5,7 @@ module DiscourseUpdates
def check_version def check_version
DiscourseVersionCheck.new( DiscourseVersionCheck.new(
latest_version: latest_version || Discourse::VERSION::STRING, latest_version: latest_version || Discourse::VERSION::STRING,
critical_updates: critical_update_available?, critical_updates: critical_updates_available?,
installed_version: Discourse::VERSION::STRING, installed_version: Discourse::VERSION::STRING,
installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version), installed_sha: (Discourse.git_version == 'unknown' ? nil : Discourse.git_version),
missing_versions_count: missing_versions_count || nil missing_versions_count: missing_versions_count || nil
@ -21,11 +21,11 @@ module DiscourseUpdates
$redis.get(missing_versions_count_key).try(:to_i) $redis.get(missing_versions_count_key).try(:to_i)
end end
def critical_update_available? def critical_updates_available?
($redis.get(critical_updates_available_key) || false) == 'true' ($redis.get(critical_updates_available_key) || false) == 'true'
end end
['latest_version', 'missing_versions_count', 'critical_update_available'].each do |name| ['latest_version', 'missing_versions_count', 'critical_updates_available'].each do |name|
eval "define_method :#{name}= do |arg| eval "define_method :#{name}= do |arg|
$redis.set #{name}_key, arg $redis.set #{name}_key, arg
end" end"

2
lib/jobs/version_check.rb
View File

@ -8,7 +8,7 @@ module Jobs
if SiteSetting.version_checks if SiteSetting.version_checks
json = DiscourseHub.discourse_version_check json = DiscourseHub.discourse_version_check
DiscourseUpdates.latest_version = json['latestVersion'] DiscourseUpdates.latest_version = json['latestVersion']
DiscourseUpdates.critical_update_available = json['criticalUpdates'] DiscourseUpdates.critical_updates_available = json['criticalUpdates']
DiscourseUpdates.missing_versions_count = json['missingVersionsCount'] DiscourseUpdates.missing_versions_count = json['missingVersionsCount']
end end
true true

2
spec/controllers/admin/versions_controller_spec.rb
View File

@ -5,7 +5,7 @@ describe Admin::VersionsController do
before do before do
DiscourseUpdates.stubs(:latest_version).returns('1.2.33') DiscourseUpdates.stubs(:latest_version).returns('1.2.33')
DiscourseUpdates.stubs(:critical_update_available?).returns(false) DiscourseUpdates.stubs(:critical_updates_available?).returns(false)
end end
it "is a subclass of AdminController" do it "is a subclass of AdminController" do