mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-10 08:17:06 +02:00
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
uu59 2014-05-29 14:52:44 +09:00
parent 59b7b05c81
commit 1f1cb60c5c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/alert.js
View File

@ -33,9 +33,7 @@
methods: { methods: {
fetchAlertsData: function() { fetchAlertsData: function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
$.getJSON(POLLING_URL, function(data){ $.getJSON(POLLING_URL, resolve).fail(reject);
resolve(data);
}).fail(reject);
}); });
} }
} }

8
app/controllers/application_controller.rb
View File

@ -23,23 +23,23 @@ class ApplicationController < ActionController::Base
end end
def installing_gem? def installing_gem?
installing_gems.length > 0 installing_gems.present?
end end
def installing_gems def installing_gems
Plugin::WORKING.find_all do |data| Plugin::WORKING.find_all do |data|
data[:type] == :install && data[:state] == :running data[:type] == :install && data[:state] == :running
end.map{|data| data[:plugin]} || [] end.map{|data| data[:plugin]}
end end
def uninstalling_gem? def uninstalling_gem?
uninstalling_gems.length > 0 uninstalling_gems.present?
end end
def uninstalling_gems def uninstalling_gems
Plugin::WORKING.find_all do |data| Plugin::WORKING.find_all do |data|
data[:type] == :uninstall && data[:state] == :running data[:type] == :uninstall && data[:state] == :running
end.map{|data| data[:plugin]} || [] end.map{|data| data[:plugin]}
end end
private private