Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge SLE-15-SP1 into master #78

Merged
merged 4 commits into from
Mar 11, 2020
Merged

Merge SLE-15-SP1 into master #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d6ca12
Add missing question mark
teclator Mar 11, 2020
20939e5
Bump version & changelog
teclator Mar 11, 2020
2a39b2a
Merge pull request #77 from yast/fix_typo
teclator Mar 11, 2020
082d35f
Merge branch 'SLE-15-SP1' into merge_SLE-15-SP1
teclator Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-samba-server.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 11 10:00:37 UTC 2020 - Knut Anderssen <kanderssen@suse.com>

- Fix check of connected users when proposing the default service
action (bsc#1166303)
- 4.2.4

-------------------------------------------------------------------
Thu Mar 5 13:59:38 UTC 2020 - Knut Anderssen <kanderssen@suse.com>

Expand Down
4 changes: 2 additions & 2 deletions package/yast2-samba-server.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# spec file for package yast2-samba-server
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
Expand All @@ -17,7 +17,7 @@


Name: yast2-samba-server
Version: 4.2.3
Version: 4.2.4
Release: 0
Url: https://github.com/yast/yast-samba-server
Summary: YaST2 - Samba Server Configuration
Expand Down
2 changes: 1 addition & 1 deletion src/include/samba-server/dialogs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def initialize_samba_server_dialogs(include_target)
def service_widget
return @service_widget if @service_widget
@service_widget = ::CWM::ServiceWidget.new(services)
@service_widget.default_action = :restart if need_to_restart? && !connected_users
@service_widget.default_action = :restart if need_to_restart? && !connected_users?
@service_widget
end

Expand Down