This commit is contained in:
Hillel Coren 2019-10-06 19:51:05 +03:00
parent 136221c1d0
commit f05c09a6d4
6 changed files with 13 additions and 12 deletions

View File

@ -137,7 +137,7 @@ abstract class GroupEntity extends Object
} }
if (userCompany.canEditEntity(this)) { if (userCompany.canEditEntity(this)) {
actions.add(EntityAction.configureSettings); actions.add(EntityAction.settings);
} }
if (userCompany.canCreate(EntityType.client)) { if (userCompany.canCreate(EntityType.client)) {

View File

@ -53,7 +53,7 @@ class EntityAction extends EnumClass {
static const EntityAction viewInvoice = _$viewInvoice; static const EntityAction viewInvoice = _$viewInvoice;
static const EntityAction clientPortal = _$clientPortal; static const EntityAction clientPortal = _$clientPortal;
static const EntityAction enterPayment = _$enterPayment; static const EntityAction enterPayment = _$enterPayment;
static const EntityAction configureSettings = _$configureSettings; static const EntityAction settings = _$settings;
static const EntityAction pdf = _$pdf; static const EntityAction pdf = _$pdf;
static const EntityAction more = _$more; static const EntityAction more = _$more;
static const EntityAction start = _$start; static const EntityAction start = _$start;

View File

@ -24,8 +24,7 @@ const EntityAction _$newTask = const EntityAction._('newTask');
const EntityAction _$viewInvoice = const EntityAction._('viewInvoice'); const EntityAction _$viewInvoice = const EntityAction._('viewInvoice');
const EntityAction _$clientPortal = const EntityAction._('clientPortal'); const EntityAction _$clientPortal = const EntityAction._('clientPortal');
const EntityAction _$enterPayment = const EntityAction._('enterPayment'); const EntityAction _$enterPayment = const EntityAction._('enterPayment');
const EntityAction _$configureSettings = const EntityAction _$settings = const EntityAction._('settings');
const EntityAction._('configureSettings');
const EntityAction _$pdf = const EntityAction._('pdf'); const EntityAction _$pdf = const EntityAction._('pdf');
const EntityAction _$more = const EntityAction._('more'); const EntityAction _$more = const EntityAction._('more');
const EntityAction _$start = const EntityAction._('start'); const EntityAction _$start = const EntityAction._('start');
@ -70,8 +69,8 @@ EntityAction _$valueOf(String name) {
return _$clientPortal; return _$clientPortal;
case 'enterPayment': case 'enterPayment':
return _$enterPayment; return _$enterPayment;
case 'configureSettings': case 'settings':
return _$configureSettings; return _$settings;
case 'pdf': case 'pdf':
return _$pdf; return _$pdf;
case 'more': case 'more':
@ -107,7 +106,7 @@ final BuiltSet<EntityAction> _$values =
_$viewInvoice, _$viewInvoice,
_$clientPortal, _$clientPortal,
_$enterPayment, _$enterPayment,
_$configureSettings, _$settings,
_$pdf, _$pdf,
_$more, _$more,
_$start, _$start,

View File

@ -1,12 +1,14 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:built_collection/built_collection.dart'; import 'package:built_collection/built_collection.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/group_model.dart'; import 'package:invoiceninja_flutter/data/models/group_model.dart';
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/app/app_actions.dart'; import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/app/app_state.dart'; import 'package:invoiceninja_flutter/redux/app/app_state.dart';
import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart';
import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:invoiceninja_flutter/utils/completers.dart'; import 'package:invoiceninja_flutter/utils/completers.dart';
@ -246,6 +248,10 @@ void handleGroupAction(
case EntityAction.edit: case EntityAction.edit:
store.dispatch(EditGroup(context: context, group: group)); store.dispatch(EditGroup(context: context, group: group));
break; break;
case EntityAction.settings:
store.dispatch(ViewSettings(
context: context, group: group, section: kSettingsCompanyDetails));
break;
case EntityAction.newClient: case EntityAction.newClient:
store.dispatch(EditClient( store.dispatch(EditClient(
context: context, context: context,

View File

@ -14,7 +14,6 @@ abstract class LocaleCodeAware {
mixin LocalizationsProvider on LocaleCodeAware { mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _localizedValues = { static final Map<String, Map<String, String>> _localizedValues = {
'en': { 'en': {
'configure_settings': 'Configure Settings',
'group_settings': 'Group Settings', 'group_settings': 'Group Settings',
'groups': 'Groups', 'groups': 'Groups',
'new_group': 'New Group', 'new_group': 'New Group',
@ -14716,9 +14715,6 @@ mixin LocalizationsProvider on LocaleCodeAware {
String get groupSettings => _localizedValues[localeCode]['group_settings']; String get groupSettings => _localizedValues[localeCode]['group_settings'];
String get configureSettings =>
_localizedValues[localeCode]['configure_settings'];
String lookup(String key) { String lookup(String key) {
final lookupKey = toSnakeCase(key); final lookupKey = toSnakeCase(key);
return _localizedValues[localeCode][lookupKey] ?? return _localizedValues[localeCode][lookupKey] ??

View File

@ -39,7 +39,7 @@ IconData getEntityActionIcon(EntityAction entityAction) {
return Icons.play_arrow; return Icons.play_arrow;
case EntityAction.stop: case EntityAction.stop:
return Icons.stop; return Icons.stop;
case EntityAction.configureSettings: case EntityAction.settings:
return Icons.settings; return Icons.settings;
default: default:
return null; return null;