From acecec113e8b3b41b0fa03bdc2e86aeba20b61fb Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 5 Aug 2021 08:54:02 +1000 Subject: [PATCH] Show snack when encountering a server error --- assets/release_notes.md | 2 ++ lib/inventree/model.dart | 19 +++++++++++++++++++ lib/l10n | 2 +- lib/widget/drawer.dart | 3 +++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/assets/release_notes.md b/assets/release_notes.md index 5de4daa5..96ad4e15 100644 --- a/assets/release_notes.md +++ b/assets/release_notes.md @@ -7,6 +7,8 @@ - Simplify process for uploading part images - Display total stock "on order" for purchaseable parts - Display supplier information for purchaseable parts +- Handle error responses from server when scanning barcodes +- Handle error responses from server when fetching model data - Update translation strings ### 0.4.1 - July 2021 diff --git a/lib/inventree/model.dart b/lib/inventree/model.dart index 97f11571..5f58c086 100644 --- a/lib/inventree/model.dart +++ b/lib/inventree/model.dart @@ -3,10 +3,13 @@ import 'dart:async'; import 'package:inventree/api.dart'; import 'package:flutter/cupertino.dart'; import 'package:inventree/inventree/sentry.dart'; +import 'package:inventree/widget/dialogs.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:path/path.dart' as path; +import '../l10.dart'; + // Paginated response object class InvenTreePageResponse { @@ -162,6 +165,11 @@ class InvenTreeModel { } ); + showServerError( + L10().serverError, + L10().errorFetch, + ); + return false; } @@ -226,6 +234,11 @@ class InvenTreeModel { } ); + showServerError( + L10().serverError, + L10().errorFetch, + ); + return null; } @@ -260,6 +273,12 @@ class InvenTreeModel { } ); + showServerError( + L10().serverError, + L10().errorCreate, + ); + + return null; } diff --git a/lib/l10n b/lib/l10n index 7cf4974a..3a2f1660 160000 --- a/lib/l10n +++ b/lib/l10n @@ -1 +1 @@ -Subproject commit 7cf4974a05bd78fa5efbea422e456ddb8a542441 +Subproject commit 3a2f1660fd5a93304272180b25340d04ba0e81aa diff --git a/lib/widget/drawer.dart b/lib/widget/drawer.dart index 41f0f7fe..9fa9bde8 100644 --- a/lib/widget/drawer.dart +++ b/lib/widget/drawer.dart @@ -145,6 +145,7 @@ class InvenTreeDrawer extends StatelessWidget { onTap: _showStock, ), + /* ListTile( title: Text("Suppliers"), leading: FaIcon(FontAwesomeIcons.building), @@ -160,6 +161,8 @@ class InvenTreeDrawer extends StatelessWidget { leading: FaIcon(FontAwesomeIcons.users), onTap: _showCustomers, ), + */ + ListTile( title: Text(L10().settings), leading: Icon(Icons.settings),