six-updater-web 0.14.5 → 0.14.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile
CHANGED
|
@@ -203,23 +203,21 @@ class MainController < ApplicationController
|
|
|
203
203
|
end
|
|
204
204
|
end
|
|
205
205
|
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
@msg << "Preset settings profile: #{setting.name}"
|
|
213
|
-
end
|
|
206
|
+
if setting
|
|
207
|
+
@msg << "Override settings profile: #{setting.name}"
|
|
208
|
+
else
|
|
209
|
+
if preset.appsetting
|
|
210
|
+
setting = preset.appsetting
|
|
211
|
+
@msg << "Preset settings profile: #{setting.name}"
|
|
214
212
|
end
|
|
213
|
+
end
|
|
215
214
|
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
end
|
|
215
|
+
if action
|
|
216
|
+
@msg << "Override action: #{action.name}"
|
|
217
|
+
else
|
|
218
|
+
if preset.action
|
|
219
|
+
action = preset.action
|
|
220
|
+
@msg << "Preset action: #{action.name}"
|
|
223
221
|
end
|
|
224
222
|
end
|
|
225
223
|
|