Commit b311fc85 authored by Rinus Plasmeijer's avatar Rinus Plasmeijer

*** empty log message ***


git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@135 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent b38a406a
......@@ -396,7 +396,7 @@ where
# (subtasksnames,tcode) = unzipsubtasks (subtasks!!mainSelected)
# ((taskSelected,subButtons,chosenTask),hst) = mkTaskButtons False ("User " <+++ thisUser <+++ "subtask" <+++ mainSelected)
thisUser [] initialOptions subtasksnames hst
= (threadcode,[showLabel chosenMain, showTrace " / ", showLabel chosenTask],mainButtons,subButtons,tcode!!taskSelected,hst)
= (threadcode,[showMainLabel chosenMain, showTrace " / ", showLabel chosenTask],mainButtons,subButtons,tcode!!taskSelected,hst)
where
unziptasks [] = ([],[])
unziptasks all=:[((wid,wlabel),tlabel,tcode):tasks]
......@@ -1558,7 +1558,8 @@ where
= checkAllTasks label taskCollection (0,chosen) True [] {tst & tasknr = tasknr, html = BT [], activated = True}
| not adone = ([a],{tst & activated = False // not done, since chosen task not finished
, html = html +|+
BT buttons +-+ (BT [showLabel chosenname] +|+ ahtml) +|+
(BT [showMainLabel label: buttons]) +-+
(BT [showLabel chosenname] +|+ ahtml) +|+
(userId -@: allhtml) // code for non selected alternatives are not shown for the owner of this task
})
# (alist,tst=:{activated=finished,html=allhtml})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment