diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/feed_edit.go | 23 | ||||
| -rw-r--r-- | ui/form/feed.go | 47 |
2 files changed, 37 insertions, 33 deletions
diff --git a/ui/feed_edit.go b/ui/feed_edit.go index a01c8c95..f2a2d692 100644 --- a/ui/feed_edit.go +++ b/ui/feed_edit.go @@ -41,17 +41,18 @@ func (h *handler) showEditFeedPage(w http.ResponseWriter, r *http.Request) { } feedForm := form.FeedForm{ - SiteURL: feed.SiteURL, - FeedURL: feed.FeedURL, - Title: feed.Title, - ScraperRules: feed.ScraperRules, - RewriteRules: feed.RewriteRules, - Crawler: feed.Crawler, - UserAgent: feed.UserAgent, - CategoryID: feed.Category.ID, - Username: feed.Username, - Password: feed.Password, - Disabled: feed.Disabled, + SiteURL: feed.SiteURL, + FeedURL: feed.FeedURL, + Title: feed.Title, + ScraperRules: feed.ScraperRules, + RewriteRules: feed.RewriteRules, + Crawler: feed.Crawler, + UserAgent: feed.UserAgent, + CategoryID: feed.Category.ID, + Username: feed.Username, + Password: feed.Password, + IgnoreHTTPCache: feed.IgnoreHTTPCache, + Disabled: feed.Disabled, } sess := session.New(h.store, request.SessionID(r)) diff --git a/ui/form/feed.go b/ui/form/feed.go index 1a04acf2..6ad8f613 100644 --- a/ui/form/feed.go +++ b/ui/form/feed.go @@ -14,17 +14,18 @@ import ( // FeedForm represents a feed form in the UI type FeedForm struct { - FeedURL string - SiteURL string - Title string - ScraperRules string - RewriteRules string - Crawler bool - UserAgent string - CategoryID int64 - Username string - Password string - Disabled bool + FeedURL string + SiteURL string + Title string + ScraperRules string + RewriteRules string + Crawler bool + UserAgent string + CategoryID int64 + Username string + Password string + IgnoreHTTPCache bool + Disabled bool } // ValidateModification validates FeedForm fields @@ -49,6 +50,7 @@ func (f FeedForm) Merge(feed *model.Feed) *model.Feed { feed.ParsingErrorMsg = "" feed.Username = f.Username feed.Password = f.Password + feed.IgnoreHTTPCache = f.IgnoreHTTPCache feed.Disabled = f.Disabled return feed } @@ -61,16 +63,17 @@ func NewFeedForm(r *http.Request) *FeedForm { } return &FeedForm{ - FeedURL: r.FormValue("feed_url"), - SiteURL: r.FormValue("site_url"), - Title: r.FormValue("title"), - ScraperRules: r.FormValue("scraper_rules"), - UserAgent: r.FormValue("user_agent"), - RewriteRules: r.FormValue("rewrite_rules"), - Crawler: r.FormValue("crawler") == "1", - CategoryID: int64(categoryID), - Username: r.FormValue("feed_username"), - Password: r.FormValue("feed_password"), - Disabled: r.FormValue("disabled") == "1", + FeedURL: r.FormValue("feed_url"), + SiteURL: r.FormValue("site_url"), + Title: r.FormValue("title"), + ScraperRules: r.FormValue("scraper_rules"), + UserAgent: r.FormValue("user_agent"), + RewriteRules: r.FormValue("rewrite_rules"), + Crawler: r.FormValue("crawler") == "1", + CategoryID: int64(categoryID), + Username: r.FormValue("feed_username"), + Password: r.FormValue("feed_password"), + IgnoreHTTPCache: r.FormValue("ignore_http_cache") == "1", + Disabled: r.FormValue("disabled") == "1", } } |