diff --git a/locales/en.json b/locales/en.json index b5fa65b..220a24b 100644 --- a/locales/en.json +++ b/locales/en.json @@ -15,7 +15,7 @@ "lastbackgroundsuccessfuldate": "Background Success Date", "lastfullsuccessfuldate": "Last Full Success Date", "lastrecommendedupdatesavailable": "Recommended Available Updates", - "lastrecommendedupdatesavailable_widget": "macOS Up-to-date", + "mac_os_uptodate": "macOS Up-to-date", "lastresultcode": "Last Result Code", "lastsessionsuccessful": "Session Successful", "lastsessionsuccessful_widget": "Last Update Session Successful", diff --git a/softwareupdate_controller.php b/softwareupdate_controller.php index 75212a2..070f03f 100644 --- a/softwareupdate_controller.php +++ b/softwareupdate_controller.php @@ -76,12 +76,9 @@ 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']); diff --git a/views/softwareupdate_outofdate_widget.yml b/views/softwareupdate_outofdate_widget.yml index f6d9595..8c4e6c9 100755 --- a/views/softwareupdate_outofdate_widget.yml +++ b/views/softwareupdate_outofdate_widget.yml @@ -1,8 +1,8 @@ type: button widget_id: su_outofdate-widget api_url: /module/softwareupdate/get_binary_widgetx/lastrecommendedupdatesavailable -i18n_title: softwareupdate.lastrecommendedupdatesavailable_widget -icon: fa-apple +i18n_title: softwareupdate.mac_os_uptodate +icon: fa-check-square listing_link: /show/listing/softwareupdate/softwareupdate buttons: - label: 1 diff --git a/views/softwareupdate_report.yml b/views/softwareupdate_report.yml index f24d685..ec6b134 100755 --- a/views/softwareupdate_report.yml +++ b/views/softwareupdate_report.yml @@ -13,20 +13,22 @@ row3: row4: softwareupdate_force_major_deferred: softwareupdate_force_minor_deferred: - softwareupdate_allow_rsr_removal: + softwareupdate_outofdate: row5: + softwareupdate_allow_rsr_removal: + softwareupdate_allow_rsr_installation: +row6: softwareupdate_ignored_updates: softwareupdate_pending_recommended_updates: softwareupdate_mrt_version: -row6: +row7: softwareupdate_gatekeeper_disk_version: softwareupdate_gatekeeper_version: softwareupdate_kext_exclude_version: -row7: +row8: softwareupdate_xprotect_version: softwareupdate_xprotect_payloads_version: - softwareupdate_allow_rsr_installation: -row8: +row9: softwareupdate_managed_updates_deferrals: softwareupdate_managed_max_deferrals: - softwareupdate_managed_product_keys: + softwareupdate_managed_product_keys: \ No newline at end of file