Make entry names optional, since notes shouldn't have names and articles should
This commit is contained in:
parent
10b1ed834a
commit
fa992bc861
6 changed files with 24 additions and 5 deletions
|
|
@ -8,6 +8,7 @@ import Import
|
|||
import Yesod.AtomFeed ( atomLink )
|
||||
|
||||
import Model.Cache ( getCached )
|
||||
import Model.Entry ( entryTitle )
|
||||
import Widget.Entry ( entryR, hEntry )
|
||||
import Widget.Feed ( hFeed )
|
||||
|
||||
|
|
@ -36,5 +37,5 @@ renderEntry entry = do
|
|||
when (actualRoute /= Just correctRoute) $
|
||||
redirectWith movedPermanently301 correctRoute
|
||||
defaultLayout $ do
|
||||
setTitle . toHtml . entryName . entityVal $ entry
|
||||
setTitle . toHtml . entryTitle . entityVal $ entry
|
||||
$(widgetFile "entry")
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ module Handler.Feed where
|
|||
import Import
|
||||
|
||||
import Data.Time.Clock.POSIX ( posixSecondsToUTCTime )
|
||||
import Model.Entry ( entryTitle )
|
||||
import Widget.Entry ( entryR )
|
||||
|
||||
import qualified Data.Text as T
|
||||
|
|
@ -47,7 +48,7 @@ toFeedEntry :: Entity Entry -> FeedEntry (Route App)
|
|||
toFeedEntry entry = FeedEntry
|
||||
{ feedEntryLink = entryR entry
|
||||
, feedEntryUpdated = entryUpdated $ entityVal entry
|
||||
, feedEntryTitle = entryName $ entityVal entry
|
||||
, feedEntryTitle = entryTitle $ entityVal entry
|
||||
, feedEntryContent = toHtml . entryContent . entityVal $ entry
|
||||
, feedEntryEnclosure = Nothing
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue