Commit 492c2b48 authored by Peter Achten's avatar Peter Achten
Browse files

*** empty log message ***

parent 77824798
...@@ -118,7 +118,7 @@ gForm {|Discussion|} informid hst = specialize myeditor informid hst ...@@ -118,7 +118,7 @@ gForm {|Discussion|} informid hst = specialize myeditor informid hst
where where
myeditor (init,formid) hst myeditor (init,formid) hst
# (Discussion messages) = formid.ival # (Discussion messages) = formid.ival
= ({changed = False, form = showDiscussion messages, value = formid.ival},hst) = ({changed = False, form = showDiscussion messages, value = formid.ival},hst)
where where
showDiscussion [] = [] showDiscussion [] = []
showDiscussion [{messageFrom,date,time,message}:more] showDiscussion [{messageFrom,date,time,message}:more]
......
...@@ -55,9 +55,9 @@ invariantLogAccounts id accounts = invariantLogins id [login \\ {login} <- accou ...@@ -55,9 +55,9 @@ invariantLogAccounts id accounts = invariantLogins id [login \\ {login} <- accou
invariantLogins :: String [Login] -> Judgement invariantLogins :: String [Login] -> Judgement
invariantLogins id [] = Ok invariantLogins id [] = Ok
invariantLogins id [login=:{loginName,password=(PasswordBox mypassword)}:logins] invariantLogins id [login=:{loginName,password=PasswordBox mypassword}:logins]
| loginName == "" = Just (id,"login name is not specified!") | loginName == "" = Just (id,"login name is not specified!")
| mypassword == "" = Just (id,"password required!") //| mypassword == "" = Just (id,"password required!")
| isMember login logins = Just (id,"login name " +++ loginName +++ " is already being used!") | isMember login logins = Just (id,"login name " +++ loginName +++ " is already being used!")
| size mypassword < 6 = Just (id,"at least 6 characters required for a password!") | size mypassword < 6 = Just (id,"at least 6 characters required for a password!")
= invariantLogins id logins = invariantLogins id logins
...@@ -276,4 +276,4 @@ where ...@@ -276,4 +276,4 @@ where
setInvariantReport :: (PaperNr, RefReport) -> (PaperNr, RefReport) setInvariantReport :: (PaperNr, RefReport) -> (PaperNr, RefReport)
setInvariantReport (nr, (RefReport (Ref2 _))) setInvariantReport (nr, (RefReport (Ref2 _)))
= (nr, (RefReport (Ref2 (uniqueReport nr uniquename)))) = (nr, (RefReport (Ref2 (uniqueReport nr uniquename))))
\ No newline at end of file
Supports Markdown
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