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
I
iTasks-SDK
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
74
Issues
74
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
clean-and-itasks
iTasks-SDK
Commits
7199cfcd
Commit
7199cfcd
authored
Sep 18, 2019
by
Steffen Michels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
expose invalid current editor states in conflict resolution functions of UpdateSharedOption
parent
baa90b4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Libraries/iTasks/WF/Tasks/Interaction.dcl
Libraries/iTasks/WF/Tasks/Interaction.dcl
+3
-3
Libraries/iTasks/WF/Tasks/Interaction.icl
Libraries/iTasks/WF/Tasks/Interaction.icl
+2
-2
No files found.
Libraries/iTasks/WF/Tasks/Interaction.dcl
View file @
7199cfcd
...
...
@@ -27,9 +27,9 @@ from Data.Functor import class Functor
//The first argument is the new view as computed from the changed sds,
//and the second argument is the edited view by the user.
::
UpdateSharedOption
a
b
=
E
.
v
:
UpdateSharedAs
(
a
->
v
)
(
a
v
->
b
)
(
v
v
->
v
)
&
iTask
v
|
E
.
v
:
UpdateSharedUsing
(
a
->
v
)
(
a
v
->
b
)
(
v
v
->
v
)
(
Editor
v
)
&
iTask
v
|
E
.
v
:
UpdateSharedUsingAuto
(
a
->
Maybe
v
)
(
a
v
->
b
)
(
v
v
->
v
)
(
Editor
v
)
&
iTask
v
=
E
.
v
:
UpdateSharedAs
(
a
->
v
)
(
a
v
->
b
)
(
v
(
Maybe
v
)
->
v
)
&
iTask
v
|
E
.
v
:
UpdateSharedUsing
(
a
->
v
)
(
a
v
->
b
)
(
v
(
Maybe
v
)
->
v
)
(
Editor
v
)
&
iTask
v
|
E
.
v
:
UpdateSharedUsingAuto
(
a
->
Maybe
v
)
(
a
v
->
b
)
(
v
(
Maybe
v
)
->
v
)
(
Editor
v
)
&
iTask
v
//Selection in arbitrary containers (explicit identification is needed)
::
SelectOption
c
s
...
...
Libraries/iTasks/WF/Tasks/Interaction.icl
View file @
7199cfcd
...
...
@@ -113,11 +113,11 @@ updateInformation` (UpdateUsing tof fromf editor) m
updateSharedInformation
::
![
UpdateSharedOption
r
w
]
!(
sds
()
r
w
)
->
Task
r
|
iTask
r
&
iTask
w
&
RWShared
sds
updateSharedInformation
options
sds
=
updateSharedInformation`
(
updateSharedEditor
options
)
sds
updateSharedInformation`
(
UpdateSharedUsing
tof
fromf
conflictf
editor
)
sds
=
interactRW
sds
{
onInit
=
\
r
->
(
r
,
Update
$
tof
r
),
onEdit
=
\
v
l
->
(
l
,
Just
(\
r
->
fromf
r
v
)),
onRefresh
=
\
r
_
(
Just
v
)
->
(
r
,
conflictf
(
tof
r
)
v
,
Nothing
)}
=
interactRW
sds
{
onInit
=
\
r
->
(
r
,
Update
$
tof
r
),
onEdit
=
\
v
l
->
(
l
,
Just
(\
r
->
fromf
r
v
)),
onRefresh
=
\
r
_
v
->
(
r
,
conflictf
(
tof
r
)
v
,
Nothing
)}
editor
@
fst
updateSharedInformation`
(
UpdateSharedUsingAuto
tof
fromf
conflictf
editor
)
sds
=
interactRW
sds
{
onInit
=
\
r
->
(
r
,
maybe
Enter
Update
(
tof
r
)),
onEdit
=
\
v
l
->
(
l
,
Just
(\
r
->
fromf
r
v
))
,
onRefresh
=
\
r
_
(
Just
v
)
->
(
r
,
maybe
v
(\
r`
->
conflictf
r`
v
)
(
tof
r
),
Nothing
)}
,
onRefresh
=
\
r
_
v
->
(
r
,
maybe
undef
(\
r`
->
conflictf
r`
v
)
(
tof
r
),
Nothing
)}
editor
@
fst
viewSharedInformation
::
![
ViewOption
r
]
!(
sds
()
r
w
)
->
Task
r
|
iTask
r
&
TC
w
&
Registrable
sds
...
...
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