Commit 18659e16 authored by Black.Lee's avatar Black.Lee

add compare_not/not_nil methods for template

parent 07c628c7
...@@ -42,6 +42,9 @@ func init() { ...@@ -42,6 +42,9 @@ func init() {
beegoTplFuncMap["dateformat"] = DateFormat beegoTplFuncMap["dateformat"] = DateFormat
beegoTplFuncMap["date"] = Date beegoTplFuncMap["date"] = Date
beegoTplFuncMap["compare"] = Compare beegoTplFuncMap["compare"] = Compare
beegoTplFuncMap["compare_not"] = CompareNot
beegoTplFuncMap["not_nil"] = NotNil
beegoTplFuncMap["not_null"] = NotNil
beegoTplFuncMap["substr"] = Substr beegoTplFuncMap["substr"] = Substr
beegoTplFuncMap["html2str"] = Html2str beegoTplFuncMap["html2str"] = Html2str
beegoTplFuncMap["str2html"] = Str2html beegoTplFuncMap["str2html"] = Str2html
......
...@@ -139,6 +139,14 @@ func Compare(a, b interface{}) (equal bool) { ...@@ -139,6 +139,14 @@ func Compare(a, b interface{}) (equal bool) {
return return
} }
func CompareNot(a, b interface{}) (equal bool) {
return ! Compare(a, b)
}
func NotNil(a interface{}) (is_nil bool) {
return CompareNot(a, nil)
}
func Config(returnType, key string, defaultVal interface{}) (value interface{}, err error) { func Config(returnType, key string, defaultVal interface{}) (value interface{}, err error) {
switch returnType { switch returnType {
case "String": case "String":
......
...@@ -72,7 +72,7 @@ func TestDate(t *testing.T) { ...@@ -72,7 +72,7 @@ func TestDate(t *testing.T) {
} }
} }
func TestCompare(t *testing.T) { func TestCompareRelated(t *testing.T) {
if !Compare("abc", "abc") { if !Compare("abc", "abc") {
t.Error("should be equal") t.Error("should be equal")
} }
...@@ -82,6 +82,15 @@ func TestCompare(t *testing.T) { ...@@ -82,6 +82,15 @@ func TestCompare(t *testing.T) {
if !Compare("1", 1) { if !Compare("1", 1) {
t.Error("should be equal") t.Error("should be equal")
} }
if CompareNot("abc", "abc") {
t.Error("should be equal")
}
if !CompareNot("abc", "aBc") {
t.Error("should be not equal")
}
if !NotNil("a string") {
t.Error("should not be nil")
}
} }
func TestHtmlquote(t *testing.T) { func TestHtmlquote(t *testing.T) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment