Corrected a merge error that broke the system menu display

Closes #797
2015-03-02 22:41:37 +01:00 · 2015-03-02 22:41:37 +01:00 · b8e5019e24
commit b8e5019e24
parent 60882d9a5c
1 changed files with 2 additions and 0 deletions
--- a/src/octoprint/static/js/app/viewmodels/settings.js
+++ b/src/octoprint/static/js/app/viewmodels/settings.js
@ -238,6 +238,8 @@ $(function() {
    
            self.temperature_profiles(response.temperature.profiles);

+            self.system_actions(response.system.actions);
+
            self.terminalFilters(response.terminalFilters);
        };