瀏覽代碼

WebAdmin: display undefined js objects as empty string

This is probably something that changed in the recent datatables update,
before it was handled automatically

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
Nicola Murino 2 年之前
父節點
當前提交
54462c26f2
共有 2 個文件被更改,包括 12 次插入0 次删除
  1. 9 0
      templates/webadmin/events.html
  2. 3 0
      templates/webadmin/iplists.html

+ 9 - 0
templates/webadmin/events.html

@@ -414,6 +414,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
                     "defaultContent": "",
                     "render": function (data, type, row) {
                         if (type === 'display') {
+                            if (!data){
+                                return "";
+                            }
                             return escapeHTML(data);
                         }
                         return data;
@@ -492,6 +495,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
                     "data": "virtual_path",
                     "render": function (data, type, row) {
                         if (type === 'display') {
+                            if (!data){
+                                return "";
+                            }
                             let ellipsisFn = $.fn.dataTable.render.ellipsis(70, true, true);
                             if (row["virtual_target_path"]){
                                 return ellipsisFn(`${data} => ${row["virtual_target_path"]}`,type);
@@ -505,6 +511,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
                     "data": "username",
                     "defaultContent": "",
                     "render": function (data, type, row) {
+                        if (!data){
+                            return "";
+                        }
                         if (type === 'display') {
                             return escapeHTML(data);
                         }

+ 3 - 0
templates/webadmin/iplists.html

@@ -455,6 +455,9 @@ $(document).ready(function () {
                 "data": "description",
                 "render": function (data, type, row) {
                     if (type === 'display') {
+                        if (!data){
+                            return "";
+                        }
                         let ellipsisFn = $.fn.dataTable.render.ellipsis(70, true, true);
                         return ellipsisFn(data,type);
                     }