Author: thardeck Date: Tue Nov 22 21:00:51 2011 New Revision: 66894 URL: http://svn.opensuse.org/viewcvs/yast?rev=66894&view=rev Log: - fixed wrong Yast categories for IUCV terminal modules (fate#310723) - fixed disabling of the IUCV input field in the ncurses dialog (fate#310723) - check z/VM ids against username specification to prevent umlauts Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/clients/iucvterminal-server.desktop trunk/s390/src/clients/iucvterminal.desktop trunk/s390/src/iucvterminal-server/ui.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=66894&r1=66893&r2=66894&view=diff ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Tue Nov 22 21:00:51 2011 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?rev=66894&r1=66893&r2=66894&view=diff ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Tue Nov 22 21:00:51 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 22 15:23:19 EDT 2011 - thardeck@suse.com + +- fixed wrong Yast categories for IUCV terminal modules (fate#310723) +- fixed disabling of the IUCV input field in the ncurses dialog (fate#310723) +- check z/VM ids against username specification to prevent umlauts + +------------------------------------------------------------------- Fri Nov 18 14:22:22 CET 2011 - aschnell@suse.de - merged proofread texts Modified: trunk/s390/src/clients/iucvterminal-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/iucvterminal-server.desktop?rev=66894&r1=66893&r2=66894&view=diff ============================================================================== --- trunk/s390/src/clients/iucvterminal-server.desktop (original) +++ trunk/s390/src/clients/iucvterminal-server.desktop Tue Nov 22 21:00:51 2011 @@ -1,13 +1,13 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 X-SuSE-YaST-Call=iucvterminal-server -X-SuSE-YaST-Group=Network +X-SuSE-YaST-Group=Net_advanced X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true X-SuSE-YaST-AutoInst= Modified: trunk/s390/src/clients/iucvterminal.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/iucvterminal.desktop?rev=66894&r1=66893&r2=66894&view=diff ============================================================================== --- trunk/s390/src/clients/iucvterminal.desktop (original) +++ trunk/s390/src/clients/iucvterminal.desktop Tue Nov 22 21:00:51 2011 @@ -1,13 +1,13 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 X-SuSE-YaST-Call=iucvterminal -X-SuSE-YaST-Group=Network +X-SuSE-YaST-Group=Net_advanced X-SuSE-YaST-Argument= X-SuSE-YaST-RootOnly=true X-SuSE-YaST-AutoInst= Modified: trunk/s390/src/iucvterminal-server/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/iucvterminal-server/ui.ycp?rev=66894&r1=66893&r2=66894&view=diff ============================================================================== --- trunk/s390/src/iucvterminal-server/ui.ycp (original) +++ trunk/s390/src/iucvterminal-server/ui.ycp Tue Nov 22 21:00:51 2011 @@ -190,7 +190,7 @@ term ZvmIdsDialogContent() { term content = `HBox(`HSpacing(HSPACING),`VBox( `VSpacing(VSPACING), - `MultiLineEdit( `id( `zvmids ), `opt(`notify), _("z/&VM IDs"), mergestring(zvm_id_list, "\n") ), + `MultiLineEdit( `id( `zvmids ), `opt(`notify), _("z/&VM IDs (auto-sorted)"), mergestring(zvm_id_list, "\n") ), `VSpacing(VSPACING) ),`HSpacing(HSPACING)); return content; @@ -754,7 +754,8 @@ integer line = 0; foreach (string zvmid, zvmid_list,{ line = line + 1; - if (regexpmatch(zvmid, "[^[:alnum:]]")) + // since alnum allows umlauts too the id is checked against the user name specification + if (regexpmatch(zvmid, "[^[:alnum:]]") || (!IUCVTerminalServer::CheckUserGroupName(zvmid) && zvmid != "")) { Popup::Notify(sformat(_("Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed."), zvmid, line)); ret = false; @@ -1056,9 +1057,6 @@ zvm_id_list = [ ]; zvm_id_entries = [TEXT_ALL]; } - - // disabled tab selection without valid z/VM IDs - UI::ChangeWidget(`id(`tab), `Enabled, (size(zvm_id_list) > 0)); } // reset repeated password on change -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org