Skip to content

Commit

Permalink
Rename Saver, Deleter
Browse files Browse the repository at this point in the history
  • Loading branch information
jinzhu committed Oct 27, 2015
1 parent b8af43b commit e5e4b1d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions admin/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (ac *controller) Create(context *Context) {
res := context.Resource
result := res.NewStruct()
if context.AddError(res.Decode(context.Context, result)); !context.HasError() {
context.AddError(res.CallSaver(result, context.Context))
context.AddError(res.CallSave(result, context.Context))
}

if context.HasError() {
Expand Down Expand Up @@ -120,7 +120,7 @@ func (ac *controller) Update(context *Context) {
context.AddError(err)
if !context.HasError() {
if context.AddError(res.Decode(context.Context, result)); !context.HasError() {
context.AddError(res.CallSaver(result, context.Context))
context.AddError(res.CallSave(result, context.Context))
}
}

Expand Down Expand Up @@ -152,7 +152,7 @@ func (ac *controller) Delete(context *Context) {
if context.checkResourcePermission(roles.Delete) {
res := context.Resource
status := http.StatusOK
if context.AddError(res.CallDeleter(res.NewStruct(), context.Context)); context.HasError() {
if context.AddError(res.CallDelete(res.NewStruct(), context.Context)); context.HasError() {
status = http.StatusNotFound
}

Expand Down
2 changes: 1 addition & 1 deletion exchange/exchange.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (res *Resource) Import(container Container, context *qor.Context) error {
result := res.NewStruct()
res.FindOneHandler(result, metaValues, context)
if err = resource.DecodeToResource(res, result, metaValues, context).Start(); err == nil {
if err = res.CallSaver(result, context); err != nil {
if err = res.CallSave(result, context); err != nil {
return err
}
}
Expand Down
4 changes: 2 additions & 2 deletions resource/curd.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ func (res *Resource) CallFindMany(result interface{}, context *qor.Context) erro
return res.FindManyHandler(result, context)
}

func (res *Resource) CallSaver(result interface{}, context *qor.Context) error {
func (res *Resource) CallSave(result interface{}, context *qor.Context) error {
return res.SaveHandler(result, context)
}

func (res *Resource) CallDeleter(result interface{}, context *qor.Context) error {
func (res *Resource) CallDelete(result interface{}, context *qor.Context) error {
return res.DeleteHandler(result, context)
}
4 changes: 2 additions & 2 deletions resource/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ type Resourcer interface {
GetMetas([]string) []Metaor
CallFindMany(interface{}, *qor.Context) error
CallFindOne(interface{}, *MetaValues, *qor.Context) error
CallSaver(interface{}, *qor.Context) error
CallDeleter(interface{}, *qor.Context) error
CallSave(interface{}, *qor.Context) error
CallDelete(interface{}, *qor.Context) error
NewSlice() interface{}
NewStruct() interface{}
}
Expand Down

0 comments on commit e5e4b1d

Please sign in to comment.