removed stubs for merge
This commit is contained in:
parent
801f1f1597
commit
9ca91b5ec8
@ -222,7 +222,7 @@ studyFeaturesPrimaryFieldFor uid = selectField $ do
|
|||||||
E.on $ feature E.^. StudyFeaturesField E.==. field E.^. StudyTermsId
|
E.on $ feature E.^. StudyFeaturesField E.==. field E.^. StudyTermsId
|
||||||
E.on $ feature E.^. StudyFeaturesDegree E.==. degree E.^. StudyDegreeId
|
E.on $ feature E.^. StudyFeaturesDegree E.==. degree E.^. StudyDegreeId
|
||||||
E.where_ $ feature E.^. StudyFeaturesUser E.==. E.val uid
|
E.where_ $ feature E.^. StudyFeaturesUser E.==. E.val uid
|
||||||
-- E.where_ $ feature E.^. StudyFeaturesValid E.==. E.val True -- TODO SJ REMOVE
|
E.where_ $ feature E.^. StudyFeaturesValid E.==. E.val True
|
||||||
E.where_ $ feature E.^. StudyFeaturesType E.==. E.val FieldPrimary
|
E.where_ $ feature E.^. StudyFeaturesType E.==. E.val FieldPrimary
|
||||||
return (feature E.^. StudyFeaturesId, degree, field)
|
return (feature E.^. StudyFeaturesId, degree, field)
|
||||||
mkOptionList <$> mapM procOptions rawOptions
|
mkOptionList <$> mapM procOptions rawOptions
|
||||||
|
|||||||
@ -18,7 +18,6 @@ pStudyFeatures studyFeaturesUser studyFeaturesUpdated = do
|
|||||||
void $ string "$$"
|
void $ string "$$"
|
||||||
|
|
||||||
let
|
let
|
||||||
studyFeaturesUpdated = error "undefined" --TODO SJ REMOVE
|
|
||||||
pStudyFeature = do
|
pStudyFeature = do
|
||||||
_ <- pKey -- Meaning unknown at this time
|
_ <- pKey -- Meaning unknown at this time
|
||||||
void $ char '!'
|
void $ char '!'
|
||||||
|
|||||||
Reference in New Issue
Block a user