Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Genesys Website
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
21
Issues
21
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Website
Commits
085a8e80
Commit
085a8e80
authored
Dec 26, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Crop selection in Descriptor and DescriptorList forms
parent
3fd4cdca
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
src/crop/actions/public.ts
src/crop/actions/public.ts
+1
-1
src/descriptorlists/ui/dashboard/descriptorlist-stepper/steps/basic-info/index.tsx
...shboard/descriptorlist-stepper/steps/basic-info/index.tsx
+1
-1
src/descriptors/ui/dashboard/c/DescriptorForm.tsx
src/descriptors/ui/dashboard/c/DescriptorForm.tsx
+1
-1
src/ui/common/forms/CheckboxSelection.tsx
src/ui/common/forms/CheckboxSelection.tsx
+1
-1
src/ui/common/forms/RadioSelection.tsx
src/ui/common/forms/RadioSelection.tsx
+1
-1
No files found.
src/crop/actions/public.ts
View file @
085a8e80
...
...
@@ -27,7 +27,7 @@ export const loadCrops = (forceReload: boolean = false) => (dispatch, getState)
if
(
isDataStale
||
forceReload
)
{
return
CropService
.
listCrops
()
.
then
((
list
)
=>
{
dispatch
(
receiveCrops
(
list
));
dispatch
(
receiveCrops
(
list
.
sort
((
a
,
b
)
=>
a
.
name
.
localeCompare
(
b
.
name
))
));
})
.
catch
((
error
)
=>
{
log
(
'
Error
'
,
error
);
...
...
src/descriptorlists/ui/dashboard/descriptorlist-stepper/steps/basic-info/index.tsx
View file @
085a8e80
...
...
@@ -55,7 +55,7 @@ class BasicInfoStep extends StepperTemplate<IDescriptorListProps> {
const
mapStateToProps
=
(
state
,
ownProps
)
=>
({
myPartners
:
state
.
partner
.
dashboard
.
myPartners
,
crops
:
state
.
crop
.
list
,
crops
:
state
.
crop
.
public
.
list
,
isInvalidForm
:
isInvalid
(
DESCRIPTORLIST_FORM
)(
state
),
});
...
...
src/descriptors/ui/dashboard/c/DescriptorForm.tsx
View file @
085a8e80
...
...
@@ -259,7 +259,7 @@ class DescriptorForm extends React.Component<any, any> {
const
selector
=
formValueSelector
(
DESCRIPTOR_FORM
);
const
mapStateToProps
=
(
state
,
ownProps
)
=>
({
crops
:
state
.
crop
.
list
,
crops
:
state
.
crop
.
public
.
list
,
dataType
:
selector
(
state
,
'
dataType
'
),
currentTerms
:
selector
(
state
,
'
terms
'
),
currentOwner
:
selector
(
state
,
'
owner
'
),
...
...
src/ui/common/forms/CheckboxSelection.tsx
View file @
085a8e80
...
...
@@ -12,7 +12,7 @@ import Checkbox from '@material-ui/core/Checkbox';
const
styles
=
(
theme
)
=>
({
radioGroupMultiColumn
:
{
flexDirection
:
'
row
'
as
'
row
'
,
justifyContent
:
'
space-between
'
as
'
space-between
'
,
justifyContent
:
'
flex-start
'
as
'
flex-start
'
,
'
& > label
'
:
{
flexBasis
:
'
12%
'
,
[
theme
.
breakpoints
.
down
(
'
lg
'
)]:
{
...
...
src/ui/common/forms/RadioSelection.tsx
View file @
085a8e80
...
...
@@ -12,7 +12,7 @@ import { withStyles } from '@material-ui/core/styles';
const
styles
=
(
theme
)
=>
({
radioGroupMultiColumn
:
{
flexDirection
:
'
row
'
as
'
row
'
,
justifyContent
:
'
space-evenly
'
as
'
space-evenly
'
,
justifyContent
:
'
flex-start
'
as
'
flex-start
'
,
'
& > label
'
:
{
flexBasis
:
'
12%
'
,
[
theme
.
breakpoints
.
down
(
'
md
'
)]:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment