--- pyanaconda/ui/gui/spokes/user.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index ee627c4..c42035d 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -51,7 +51,7 @@ class AdvancedUserDialog(GUIObject): def initialize(self): GUIObject.initialize(self)
- def _apply_checkboxes(self, _editable, data = None): + def _apply_checkboxes(self, _editable = None, data = None): """Update the state of this screen according to the checkbox states on the screen. It is called from the toggled Gtk event. @@ -72,6 +72,14 @@ class AdvancedUserDialog(GUIObject): elif self._user.name: t_home.set_text("/home/%s" % self._user.name)
+ c_home = self.builder.get_object("c_home") + c_home.set_active(bool(self._user.homedir)) + c_uid = self.builder.get_object("c_uid") + c_uid.set_active(bool(self._user.uid)) + c_gid = self.builder.get_object("c_gid") + c_gid.set_active(bool(self._user.gid)) + self._apply_checkboxes() + groups = [] for group_name in self._user.groups: group = self._groupDict[group_name]
--- pyanaconda/ui/gui/spokes/user.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index c42035d..c128c94 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -426,10 +426,12 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
def on_back_clicked(self, button): # Return if: + # - no user is requested (empty username) # - no password is required # - password is set by kickstart and password text entry is empty # - password is set by dialog and _validatePassword returns True - if not self.usepassword.get_active() or \ + if not self.username.get_text() or \ + not self.usepassword.get_active() or \ (self.pw.get_text() == "" and \ self.pw.get_text() == self.confirm.get_text() and \ self._user.password_kickstarted) or \
--- pyanaconda/ui/gui/spokes/user.py | 1 - 1 file changed, 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py index c128c94..6511ea3 100644 --- a/pyanaconda/ui/gui/spokes/user.py +++ b/pyanaconda/ui/gui/spokes/user.py @@ -287,7 +287,6 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke):
if editable.get_text() == "": self.guesser[editable] = True - self._guessNames() else: self.guesser[editable] = False
These all look good to me.
anaconda-patches@lists.fedorahosted.org