extended for load all + search all
This commit is contained in:
@@ -379,7 +379,7 @@ func (r *Request) PaymentTunnel(o *order.Order, scheduler *workflow_execution.Wo
|
||||
* @param c ...*tools.HTTPCaller
|
||||
* @return data LibDataShallow
|
||||
*/
|
||||
func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset int64, limit int64) (data LibDataShallow) {
|
||||
func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset int64, limit int64, extend ...string) (data LibDataShallow) {
|
||||
defer func() { // recover the panic
|
||||
if r := recover(); r != nil {
|
||||
tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in Search : "+fmt.Sprintf("%v", r)))
|
||||
@@ -397,6 +397,9 @@ func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset
|
||||
data = LibDataShallow{Data: d, Code: code, Err: err.Error()}
|
||||
return
|
||||
}
|
||||
for _, dd := range d {
|
||||
dd = GetExtend(dd, dd.Extend(extend...))
|
||||
}
|
||||
data = LibDataShallow{Data: d, Code: code}
|
||||
return
|
||||
}
|
||||
@@ -407,7 +410,7 @@ func (r *Request) Search(filters *dbs.Filters, word string, isDraft bool, offset
|
||||
* @param c ...*tools.HTTPCaller
|
||||
* @return data LibDataShallow
|
||||
*/
|
||||
func (r *Request) LoadAll(isDraft bool, offset int64, limit int64) (data LibDataShallow) {
|
||||
func (r *Request) LoadAll(isDraft bool, offset int64, limit int64, extend ...string) (data LibDataShallow) {
|
||||
defer func() { // recover the panic
|
||||
if r := recover(); r != nil {
|
||||
tools.UncatchedError = append(tools.UncatchedError, errors.New("Panic recovered in LoadAll : "+fmt.Sprintf("%v", r)+" - "+string(debug.Stack())))
|
||||
@@ -425,6 +428,9 @@ func (r *Request) LoadAll(isDraft bool, offset int64, limit int64) (data LibData
|
||||
data = LibDataShallow{Data: d, Code: code, Err: err.Error()}
|
||||
return
|
||||
}
|
||||
for _, dd := range d {
|
||||
dd = GetExtend(dd, dd.Extend(extend...))
|
||||
}
|
||||
data = LibDataShallow{Data: d, Code: code}
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user