Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
MKCLOS
Core Development Platform
corepkgv2
Commits
1ed69b80
Commit
1ed69b80
authored
6 years ago
by
Roshan Patil
Browse files
Options
Downloads
Patches
Plain Diff
dynamic form error skip
parent
988b67ec
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!68
Core dev bto c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
authmdl/roleenforcemdl/roleenforcement.go
+0
-11
authmdl/roleenforcemdl/roleenforcement.go
routebuildermdl/dynamicFormResponseEval.go
+4
-3
routebuildermdl/dynamicFormResponseEval.go
with
4 additions
and
14 deletions
authmdl/roleenforcemdl/roleenforcement.go
+
0
−
11
View file @
1ed69b80
...
...
@@ -172,16 +172,5 @@ func GetGroupNames(decodedToken jwt.MapClaims, groupKey string) ([]string, error
stringArray
=
append
(
stringArray
,
group
)
}
// byteArray, marshalError := json.Marshal(groups)
// if errormdl.CheckErr(marshalError) != nil {
// loggermdl.LogError("error occured while marshalling groups : ", errormdl.CheckErr(marshalError))
// return nil, errormdl.CheckErr(marshalError)
// }
// unmarshalError := json.Unmarshal(byteArray, &stringArray)
// if errormdl.CheckErr(unmarshalError) != nil {
// loggermdl.LogError("error occured while unmarshalling groups : ", errormdl.CheckErr(unmarshalError))
// return nil, errormdl.CheckErr(unmarshalError)
// }
return
stringArray
,
nil
}
This diff is collapsed.
Click to expand it.
routebuildermdl/dynamicFormResponseEval.go
+
4
−
3
View file @
1ed69b80
...
...
@@ -59,9 +59,10 @@ func dynamicFormEvalution(ab *servicebuildermdl.AbstractBusinessLogicHolder, rs
}
result
,
evalErr
:=
conditions
.
Evaluate
(
expr
,
eval
)
if
errormdl
.
CheckErr
(
evalErr
)
!=
nil
{
ab
.
SetErrorCode
(
errormdl
.
CONDITIONPARSEERROR
)
loggermdl
.
LogError
(
evalErr
)
return
nil
,
errormdl
.
CheckErr
(
evalErr
)
// ab.SetErrorCode(errormdl.CONDITIONPARSEERROR)
// loggermdl.LogError(evalErr)
// return nil, errormdl.CheckErr(evalErr)
continue
}
if
result
{
return
obj
.
Value
(),
nil
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets