Skip to content

Extract form utilities and move to main beego. Refs astaxie/beego#835. #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bsingr wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Extract form utilities and move to main beego. Refs astaxie/beego#835. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdd5015
Extract form utilities and move to main beego. Refs astaxie/beego#835.
bsingr Oct 6, 2014
a0c4997
Remove GetData from FormController interface. Refs #835.
bsingr Oct 9, 2014
bc61b63
Move beego.Date*Format => forms.Date*Format. Refs #835.
bsingr Oct 9, 2014
0ca1b13
Re-indent settings variables. Refs #835.
bsingr Oct 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/article/form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package article

import (
"github.com/astaxie/beego/utils/forms"
"github.com/astaxie/beego/validation"

"github.com/beego/wetalk/modules/models"
Expand All @@ -41,7 +42,7 @@ func (form *ArticleAdminForm) Valid(v *validation.Validation) {
}

func (form *ArticleAdminForm) SetFromArticle(article *models.Article) {
utils.SetFormValues(article, form)
forms.SetFormValues(article, form)

if article.User != nil {
form.User = article.User.Id
Expand All @@ -53,7 +54,7 @@ func (form *ArticleAdminForm) SetFromArticle(article *models.Article) {
}

func (form *ArticleAdminForm) SetToArticle(article *models.Article) {
utils.SetFormValues(form, article)
forms.SetFormValues(form, article)

if article.User == nil {
article.User = &models.User{}
Expand Down
11 changes: 6 additions & 5 deletions modules/auth/form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package auth
import (
"strings"

"github.com/astaxie/beego/utils/forms"
"github.com/astaxie/beego/validation"
"github.com/beego/i18n"

Expand Down Expand Up @@ -215,7 +216,7 @@ func (form *ProfileForm) Valid(v *validation.Validation) {
}

func (form *ProfileForm) SetFromUser(user *models.User) {
utils.SetFormValues(user, form)
forms.SetFormValues(user, form)
}

func (form *ProfileForm) SaveUserProfile(user *models.User) error {
Expand All @@ -224,15 +225,15 @@ func (form *ProfileForm) SaveUserProfile(user *models.User) error {
form.GrEmail = utils.EncodeMd5(form.GrEmail)
}

changes := utils.FormChanges(user, form)
changes := forms.FormChanges(user, form)
if len(changes) > 0 {
// if email changed then need re-active
if user.Email != form.Email {
user.IsActive = false
changes = append(changes, "IsActive")
}

utils.SetFormValues(form, user)
forms.SetFormValues(form, user)
return user.Update(changes...)
}
return nil
Expand Down Expand Up @@ -389,7 +390,7 @@ func (form *UserAdminForm) Labels() map[string]string {
}

func (form *UserAdminForm) SetFromUser(user *models.User) {
utils.SetFormValues(user, form)
forms.SetFormValues(user, form)
}

func (form *UserAdminForm) SetToUser(user *models.User) {
Expand All @@ -398,5 +399,5 @@ func (form *UserAdminForm) SetToUser(user *models.User) {
form.GrEmail = utils.EncodeMd5(form.GrEmail)
}

utils.SetFormValues(form, user)
forms.SetFormValues(form, user)
}
17 changes: 9 additions & 8 deletions modules/post/form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package post

import (
"github.com/astaxie/beego/utils/forms"
"github.com/astaxie/beego/validation"
"github.com/beego/i18n"

Expand Down Expand Up @@ -88,7 +89,7 @@ func (form *PostForm) Valid(v *validation.Validation) {
}

func (form *PostForm) SavePost(post *models.Post, user *models.User) error {
utils.SetFormValues(form, post)
forms.SetFormValues(form, post)
post.Category = &models.Category{Id: form.Category}
post.Topic = &models.Topic{Id: form.Topic}
post.User = user
Expand All @@ -103,17 +104,17 @@ func (form *PostForm) SavePost(post *models.Post, user *models.User) error {
}

func (form *PostForm) SetFromPost(post *models.Post) {
utils.SetFormValues(post, form)
forms.SetFormValues(post, form)
form.Category = post.Category.Id
form.Topic = post.Topic.Id
}

func (form *PostForm) UpdatePost(post *models.Post, user *models.User) error {
changes := utils.FormChanges(post, form)
changes := forms.FormChanges(post, form)
if len(changes) == 0 {
return nil
}
utils.SetFormValues(form, post)
forms.SetFormValues(form, post)
post.Category.Id = form.Category
post.Topic.Id = form.Topic
for _, c := range changes {
Expand Down Expand Up @@ -191,7 +192,7 @@ func (form *PostAdminForm) Valid(v *validation.Validation) {
}

func (form *PostAdminForm) SetFromPost(post *models.Post) {
utils.SetFormValues(post, form)
forms.SetFormValues(post, form)

if post.User != nil {
form.User = post.User.Id
Expand All @@ -215,7 +216,7 @@ func (form *PostAdminForm) SetFromPost(post *models.Post) {
}

func (form *PostAdminForm) SetToPost(post *models.Post) {
utils.SetFormValues(form, post)
forms.SetFormValues(form, post)

if post.User == nil {
post.User = &models.User{}
Expand Down Expand Up @@ -288,7 +289,7 @@ func (form *CommentAdminForm) Valid(v *validation.Validation) {
}

func (form *CommentAdminForm) SetFromComment(comment *models.Comment) {
utils.SetFormValues(comment, form)
forms.SetFormValues(comment, form)

if comment.User != nil {
form.User = comment.User.Id
Expand All @@ -300,7 +301,7 @@ func (form *CommentAdminForm) SetFromComment(comment *models.Comment) {
}

func (form *CommentAdminForm) SetToComment(comment *models.Comment) {
utils.SetFormValues(form, comment)
forms.SetFormValues(form, comment)

if comment.User == nil {
comment.User = &models.User{}
Expand Down
10 changes: 5 additions & 5 deletions modules/post/topic_form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
package post

import (
"github.com/astaxie/beego/utils/forms"
"github.com/astaxie/beego/validation"

"github.com/beego/wetalk/modules/models"
"github.com/beego/wetalk/modules/utils"
)

type TopicAdminForm struct {
Expand Down Expand Up @@ -51,11 +51,11 @@ func (form *TopicAdminForm) Valid(v *validation.Validation) {
}

func (form *TopicAdminForm) SetFromTopic(topic *models.Topic) {
utils.SetFormValues(topic, form)
forms.SetFormValues(topic, form)
}

func (form *TopicAdminForm) SetToTopic(topic *models.Topic) {
utils.SetFormValues(form, topic, "Id")
forms.SetFormValues(form, topic, "Id")
}

type CategoryAdminForm struct {
Expand All @@ -79,9 +79,9 @@ func (form *CategoryAdminForm) Valid(v *validation.Validation) {
}

func (form *CategoryAdminForm) SetFromCategory(cat *models.Category) {
utils.SetFormValues(cat, form)
forms.SetFormValues(cat, form)
}

func (form *CategoryAdminForm) SetToCategory(cat *models.Category) {
utils.SetFormValues(form, cat, "Id")
forms.SetFormValues(form, cat, "Id")
}
Loading