Project

General

Profile

« Previous | Next » 

Revision 46329

View differences:

UserRegistrationForm.java
212 212
                    || GoldOAPortal.userRoles.get(i).getId().equals("moderator")
213 213
                || GoldOAPortal.userRoles.get(i).getId().equals("accounting"))) {
214 214
                userRole.addItem(GoldOAPortal.userRoles.get(i).getRole(), GoldOAPortal.userRoles.get(i).getId());
215
                roles.put(GoldOAPortal.userRoles.get(i).getRole(), GoldOAPortal.userRoles.get(i).getId());
215
                roles.put(GoldOAPortal.userRoles.get(i).getId(),GoldOAPortal.userRoles.get(i).getRole());
216 216
                rolesMap.put(GoldOAPortal.userRoles.get(i).getId(), i);
217 217
            }
218 218
        }
......
550 550
                        personRole.setApproved(false);
551 551
                }
552 552
            }
553
            person.getRoles().add(personRole);
553
            personRoles.add(personRole);
554 554
        }
555 555

  
556 556
        for(String roleId : notShownRoles) {
......
577 577
                        personRole.setApproved(false);
578 578
                }
579 579
            }
580
            person.getRoles().add(personRole);
580
            personRoles.add(personRole);
581 581
        }
582
        //person.setRole(personRoles);
582
        person.setRole(personRoles);
583

  
583 584
        person.setActive(false);
584 585
        return person;
585 586
    }
......
745 746

  
746 747
        userRole.setMultipleSelect(true);
747 748
        for(String roleId : selectedRoles) {
748
          //  userRole.setItemSelected(rolesMap.get(roleId), true);
749
            userRole.setItemSelected(rolesMap.get(roleId), true);
749 750
        }
750 751
    }
751 752

  
......
762 763
        multipleAffiliationsWidget.clear();
763 764

  
764 765
        for(Map.Entry<String, Integer> entry : rolesMap.entrySet()) {
765
           // userRole.setItemSelected(entry.getValue(), false);
766
            //Window.alert(entry.getValue().toString());
767
            //userRole.setItemSelected(entry.getValue(), false);
766 768
        }
767 769
        orcidID.setValue("");
768 770
        projectAutoComplete.setValue("");

Also available in: Unified diff