Author: vjrj_ Date: 2011-10-09 13:20:08 +0200 (Sun, 09 Oct 2011) New Revision: 1549 Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java Log: NEW - # 138: Add change password functionality to the User Interface http://kune.ourproject.org/issues/ticket/138 Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-10-09 10:59:28 UTC (rev 1548) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveServiceDefault.java 2011-10-09 11:20:08 UTC (rev 1549) @@ -237,7 +237,7 @@ final Blip rootBlip = newWavelet.getRootBlip(); rootBlip.append(new com.google.wave.api.Markup(message).getText()); - if (waveIdToCopy != NO_WAVE_TO_COPY) { + if (waveIdToCopy != NO_WAVE_TO_COPY || TextUtils.notEmpty(waveIdToCopy)) { try { WaveId copyWaveId; copyWaveId = WaveId.ofChecked(domain, waveIdToCopy); Modified: trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2011-10-09 10:59:28 UTC (rev 1548) +++ trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2011-10-09 11:20:08 UTC (rev 1549) @@ -144,6 +144,7 @@ public void init() { new IntegrationTestHelper(this); lang = new I18nLanguageDTO(); + lang.setCode("en"); simpleLang = new I18nLanguageSimpleDTO(lang.getCode(), lang.getEnglishName()); country = new I18nCountryDTO(); timezone = new TimeZoneDTO(); @@ -255,8 +256,8 @@ timezone, null, true, SubscriptionMode.manual, "blue"); userService.createUser(user, false); doLogin("test", "123456"); - final UserDTO userChanged = new UserDTO("test", longName, "123456", email, lang, country, timezone, - null, true, SubscriptionMode.manual, "blue"); + final UserDTO userChanged = new UserDTO(shortName, longName, "123456", email, lang, country, + timezone, null, true, SubscriptionMode.manual, "blue"); userChanged.setId(session.getUser().getId()); userService.updateUser(getHash(), userChanged, simpleLang); }