Skip to content

P
purescript-gargantext
Commit 4981cc3f authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

[MERGE] fix conflicts.

parents 015011ca e9191d83
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
dist/styles/Login.sass
View file @ 4981cc3f
...@@ -170,3 +170,6 @@ li ...@@ -170,3 +170,6 @@ li
.tab-pane .tab-pane
.reload-btn .reload-btn
padding-right: 6px padding-right: 6px
src/Gargantext/Components/Search/SearchField.purs
View file @ 4981cc3f
...@@ -312,3 +312,7 @@ submitButton node_id (datafield /\ _) (term /\ _) (lang /\ _) (_ /\ setSearch) = ...@@ -312,3 +312,7 @@ submitButton node_id (datafield /\ _) (term /\ _) (lang /\ _) (_ /\ setSearch) =
case term of case term of
"" -> setSearch $ const Nothing "" -> setSearch $ const Nothing
_ -> setSearch $ const $ Just {datafield, term, lang, node_id} _ -> setSearch $ const $ Just {datafield, term, lang, node_id}
src/Gargantext/Components/Search/Types.purs
View file @ 4981cc3f
...@@ -355,3 +355,4 @@ instance encodeJsonSearchQuery :: EncodeJson SearchQuery where ...@@ -355,3 +355,4 @@ instance encodeJsonSearchQuery :: EncodeJson SearchQuery where
performSearch :: forall a. DecodeJson a => Session -> SearchQuery -> Aff a performSearch :: forall a. DecodeJson a => Session -> SearchQuery -> Aff a
performSearch session q = post session q q performSearch session q = post session q q
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