Skip to content

Commit

Permalink
drop receive system mail in installation (FATE#320448)
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Feb 4, 2016
1 parent 49f382f commit 0f35228
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions src/lib/users/dialogs/inst_user_first.rb
Expand Up @@ -33,7 +33,7 @@ class InstUserFirstDialog < ::UI::InstallationDialog
# Widgets to enable/disable depending on the selected action
# (the first one receives the initial focus if applicable)
WIDGETS = {
new_user: [:full_name, :username, :pw1, :pw2, :root_pw, :root_mail, :autologin],
new_user: [:full_name, :username, :pw1, :pw2, :root_pw, :autologin],
import: [:choose_users, :import_qty_label],
skip: []
}
Expand Down Expand Up @@ -177,9 +177,6 @@ def help_text
"<p>\nThe username and password created here are needed to log in " \
"and work with your Linux system. With <b>Automatic Login</b> enabled, " \
"the login procedure is skipped. This user is logged in automatically.</p>\n"
) +
_(
"<p>\nHave mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
)

if import_available?
Expand Down Expand Up @@ -231,7 +228,6 @@ def init_user_attributes

init_autologin
init_pw_for_root
init_root_mail
end

# Sets the initial default value for autologin
Expand Down Expand Up @@ -261,12 +257,6 @@ def init_pw_for_root
end
end

# Sets the initial value of the flag for the user to get root's mail
# Requires @username to be already set
def init_root_mail
@root_mail = !@username.empty? && UsersSimple.GetRootAlias == @username
end

# Sets the initial value for the action selection
# Requires @users to be already set
def init_action
Expand Down Expand Up @@ -388,9 +378,6 @@ def create_new_user
UsersSimple.SetAutologinUser(
UI.QueryWidget(Id(:autologin), :Value) ? @username : ""
)
UsersSimple.SetRootAlias(
UI.QueryWidget(Id(:root_mail), :Value) ? @username : ""
)
end

def process_import_form
Expand Down Expand Up @@ -425,7 +412,6 @@ def set_users_list(users)
UsersSimple.SkipRootPasswordDialog(false)
UsersSimple.SetRootPassword("") if root_dialog_follows
UsersSimple.SetAutologinUser("")
UsersSimple.SetRootAlias("")
end

def valid_username?(username)
Expand Down Expand Up @@ -601,10 +587,6 @@ def new_user_options
@use_pw_for_root
)
),
Left(
# checkbox label
CheckBox(Id(:root_mail), _("Receive S&ystem Mail"), @root_mail)
),
# checkbox label
Left(CheckBox(Id(:autologin), _("&Automatic Login"), @autologin))
]
Expand Down

0 comments on commit 0f35228

Please sign in to comment.