Skip to content
This repository has been archived by the owner on Feb 4, 2025. It is now read-only.

Commit

Permalink
Merge pull request #313 from CampusDual/bug-fix-admin-roles
Browse files Browse the repository at this point in the history
Solución de error al seleccionar roles de usuario desde admin, bug-fix-armin-roles
  • Loading branch information
marcospaab authored Jan 28, 2025
2 parents be35c79 + 80bb99e commit 408da3b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
[enabled]="!form.isInInsertMode()" selection-mode="none" export-mode="local">
<o-table-columns-filter columns="rol_name;rol_notes"></o-table-columns-filter>
<o-table-column attr="actived" title="active">
<o-table-cell-renderer-boolean boolean-type="string" true-value="S" false-value="N" true-value-type="icon"
<o-table-cell-renderer-boolean boolean-type="boolean" true-value="true" false-value="false" true-value-type="icon"
render-type="icon" render-true-value="check_box" render-false-value="check_box_outline_blank">
</o-table-cell-renderer-boolean>
<o-table-cell-editor-boolean true-value="S" false-value="N"
boolean-type="string"></o-table-cell-editor-boolean>
<o-table-cell-editor-boolean true-value="true" false-value="false"
boolean-type="boolean"></o-table-cell-editor-boolean>
</o-table-column>
</o-table>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public AdvancedEntityResult rolesForUserPaginationQuery(Map<?, ?> keysValues, Li
public EntityResult rolesForUserUpdate(final Map<?, ?> attributesValues, final Map<?, ?> keysValues)
throws OntimizeJEERuntimeException {
try {
if ("S".equals(attributesValues.get(UserRoleDao.ACTIVED))) {
if ((Boolean) attributesValues.get(UserRoleDao.ACTIVED)) {
// insert
final Map<String, Object> valuesToInsert = new HashMap<>();
valuesToInsert.put(UserRoleDao.USR_ID, keysValues.get(UserRoleDao.USR_ID));
Expand Down
2 changes: 1 addition & 1 deletion cd2024bfs4g1-model/src/main/resources/dao/UserRoleDao.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</AmbiguousColumns>
<FunctionColumns>
<FunctionColumn name="actived"
value="(CASE WHEN tur.rol_id IS NOT NULL THEN 'S' ELSE 'N' END)" />
value="(CASE WHEN tur.rol_id IS NOT NULL THEN true ELSE false END)" />
</FunctionColumns>
<Sentence>
<![CDATA[
Expand Down

0 comments on commit 408da3b

Please sign in to comment.