buttons, optim, outofdate widget

js/softwareupdate.js

@@ -62,4 +62,251 @@ var ManagedDeferralCounterFilter = function(colNumber, d){
         // Clear global search
         d.search.value = '';
     }
+}
+
+var uptodateFilter = function(colNumber, d){
+    // Look for 'not_safety_frozen' keyword
+    if(d.search.value.match(/^macos_updtodate$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'safety_frozen' keyword
+    if(d.search.value.match(/^macos_not_updtodate$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '!= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var allow_prerelease_installation_filter = function(colNumber, d){
+    // Look for 'prerelease_off' keyword
+    if(d.search.value.match(/^prerelease_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'prerelease_on' keyword
+    if(d.search.value.match(/^prerelease_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var softwareUpdateYesNo = function(colNumber, row){
+    var col = $('td:eq('+colNumber+')', row),
+        colvar = col.text();
+    colvar = colvar != '1' ? '<span class="label label-danger">'+i18n.t('No')+'</span>' :
+    colvar = (colvar == '1' ? '<span class="label label-success">'+i18n.t('Yes')+'</span>' : colvar)
+    col.html(colvar)
+}
+
+var allow_rsr_installation_filter = function(colNumber, d){
+    // Look for 'rsr_off' keyword
+    if(d.search.value.match(/^rsr_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'rsr_on' keyword
+    if(d.search.value.match(/^rsr_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var allow_rsr_removal_filter = function(colNumber, d){
+    // Look for 'rsr_removal_off' keyword
+    if(d.search.value.match(/^rsr_removal_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'rsr_removal_on' keyword
+    if(d.search.value.match(/^rsr_removal_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var auto_update_restart_required_filter = function(colNumber, d){
+    // Look for 'restart_required_off' keyword
+    if(d.search.value.match(/^restart_required_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'restart_required_on' keyword
+    if(d.search.value.match(/^restart_required_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var auto_update_filter = function(colNumber, d){
+    // Look for 'auto_update_off' keyword
+    if(d.search.value.match(/^auto_update_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'auto_update_on' keyword
+    if(d.search.value.match(/^auto_update_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var automaticcheckenabled_filter = function(colNumber, d){
+    // Look for 'autocheck_off' keyword
+    if(d.search.value.match(/^autocheck_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'autocheck_on' keyword
+    if(d.search.value.match(/^autocheck_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var automaticdownload_filter = function(colNumber, d){
+    // Look for 'autodownload_off' keyword
+    if(d.search.value.match(/^autodownload_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'autodownload_on' keyword
+    if(d.search.value.match(/^autodownload_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var force_major_deferred_filter = function(colNumber, d){
+    if(d.search.value.match(/^major_deferred_off$/))
+    {
+        d.columns[colNumber].search.value = '= 0';
+        d.search.value = '';
+    }
+    if(d.search.value.match(/^major_deferred_on$/))
+    {
+        d.columns[colNumber].search.value = '= 1';
+        d.search.value = '';
+    }
+}
+
+var criticalupdateinstall_filter = function(colNumber, d){
+    if(d.search.value.match(/^critical_install_off$/))
+    {
+        d.columns[colNumber].search.value = '= 0';
+        d.search.value = '';
+    }
+    if(d.search.value.match(/^critical_install_on$/))
+    {
+        d.columns[colNumber].search.value = '= 1';
+        d.search.value = '';
+    }
+}
+
+var configdatainstall_filter = function(colNumber, d){
+    if(d.search.value.match(/^config_install_off$/))
+    {
+        d.columns[colNumber].search.value = '= 0';
+        d.search.value = '';
+    }
+    if(d.search.value.match(/^config_install_on$/))
+    {
+        d.columns[colNumber].search.value = '= 1';
+        d.search.value = '';
+    }
+}
+
+var force_minor_deferred_filter = function(colNumber, d){
+    // Look for 'minor_deferred_off' keyword
+    if(d.search.value.match(/^minor_deferred_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'minor_deferred_on' keyword
+    if(d.search.value.match(/^minor_deferred_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
+}
+
+var lastsessionsuccessful_filter = function(colNumber, d){
+    // Look for 'last_session_off' keyword
+    if(d.search.value.match(/^last_session_off$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 0';
+        // Clear global search
+        d.search.value = '';
+    }
+
+    // Look for 'last_session_on' keyword
+    if(d.search.value.match(/^last_session_on$/))
+    {
+        // Add column specific search
+        d.columns[colNumber].search.value = '= 1';
+        // Clear global search
+        d.search.value = '';
+    }
 }

locales/en.json

@@ -15,7 +15,7 @@
     "lastbackgroundsuccessfuldate": "Background Success Date",
     "lastfullsuccessfuldate": "Last Full Success Date",
     "lastrecommendedupdatesavailable": "Recommended Available Updates",
-    "mac_os_uptodate": "macOS Up-to-date",
+    "lastrecommendedupdatesavailable_widget": "macOS Updates Pending",
     "lastresultcode": "Last Result Code",
     "lastsessionsuccessful": "Session Successful",
     "lastsessionsuccessful_widget": "Last Update Session Successful",

provides.yml

@@ -61,4 +61,4 @@ widgets:
 reports:
     softwareupdate_report:
         view: softwareupdate_report
-        i18n: softwareupdate.reporttitle
+        i18n: softwareupdate.reporttitle

scripts/softwareupdate

@@ -303,7 +303,7 @@ def get_ddm_info():
     if os.path.isfile("/private/var/db/softwareupdate/SoftwareUpdateDDMStatePersistence.plist"):
         plist = FoundationPlist.readPlist("/private/var/db/softwareupdate/SoftwareUpdateDDMStatePersistence.plist")
 
-        if plist["SUCorePersistedStatePolicyFields"] and plist["SUCorePersistedStatePolicyFields"]["Declarations"]:
+        if "SUCorePersistedStatePolicyFields" in plist and plist["SUCorePersistedStatePolicyFields"] and "Declarations" in plist["SUCorePersistedStatePolicyFields"]:
             key_index = 1
             ddm_info = ""
             for declaration in plist["SUCorePersistedStatePolicyFields"]["Declarations"]:

softwareupdate_controller.php

@@ -76,9 +76,12 @@ public function get_pending_widget($column = '')
         $updates = [];
 
         foreach(Softwareupdate_model::select($column . ' AS label')
+                    ->selectRaw('count(*) AS count')
                     ->whereNotNull($column)
                     ->where($column, '<>', '')
                     ->filter()
+                    ->groupBy($column)
+                    ->orderBy('count', 'desc')
                     ->get()
                     ->toArray() as $update){
             $update_array = explode( ', ', $update['label']);

views/softwareupdate_allow_prerelease_installation_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: prerelease_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: prerelease_on

views/softwareupdate_allow_rsr_installation_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: rsr_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: rsr_on

views/softwareupdate_allow_rsr_removal_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 1
     i18n_label: yes
     class: btn-danger 
+    search_component: rsr_removal_on
   - label: 0
     i18n_label: no
     class: btn-success
+    search_component: rsr_removal_off

views/softwareupdate_auto_update_restart_required_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: restart_required_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: restart_required_on

views/softwareupdate_auto_update_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: auto_update_off
   - label: 1
     i18n_label: yes
-    class: btn-success
+    class: btn-success
+    search_component: auto_update_on

views/softwareupdate_automaticcheckenabled_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: autocheck_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: autocheck_on

views/softwareupdate_automaticdownload_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: autodownload_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: autodownload_on

views/softwareupdate_configdatainstall_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: config_install_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: config_install_on

views/softwareupdate_criticalupdateinstall_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 0
     i18n_label: no
     class: btn-danger 
+    search_component: critical_install_off
   - label: 1
     i18n_label: yes
     class: btn-success
+    search_component: critical_install_on

views/softwareupdate_force_major_deferred_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 1
     i18n_label: yes
     class: btn-info 
+    search_component: major_deferred_on
   - label: 0
     i18n_label: no
     class: btn-success
+    search_component: major_deferred_off

views/softwareupdate_force_minor_deferred_widget.yml

@@ -8,6 +8,8 @@ buttons:
   - label: 1
     i18n_label: yes
     class: btn-info 
+    search_component: minor_deferred_on
   - label: 0
     i18n_label: no
     class: btn-success
+    search_component: minor_deferred_off