michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Nicer messages for updating a single repo

Browse Source
This commit is contained in:
Jamie Cameron
2019-04-21 18:10:14 -07:00
parent dc1e9fa77e
commit 06f74a28cb
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package-updates/lang/en
View File

@@ -106,6 +106,10 @@ log_refresh=Refreshed available packages
log_enable_repos=Enabled $1 package repositories
log_disable_repos=Disabled $1 package repositories
log_delete_repos=Deleted $1 package repositories
log_enable_repo=Enabled package repository $1
log_disable_repo=Disabled package repository $1
log_delete_repo=Deleted package repository $1
log_create_repo=Created package repository $1
refresh_title=Refreshing Packages
refresh_clearing=Clearing package caches ..

4
package-updates/log_parser.pl
View File

@@ -11,6 +11,10 @@ my ($user, $script, $action, $type, $object, $p) = @_;
if ($type eq 'repos') {
return &text('log_'.$action.'_repos', $object);
}
elsif ($type eq 'repo') {
return &text('log_'.$action.'_repos',
"<tt>".&html_escape($object)."</tt>");
}
elsif ($action eq 'update') {
return &text('log_update', $object);
}

14
package-updates/save_repos.cgi
View File

@@ -21,7 +21,12 @@ if ($mode eq 'enable' || $mode eq 'disable') {
foreach my $repo (@delrepos) {
&software::enable_package_repo($repo, $mode eq 'enable');
}
&webmin_log($mode, 'repos', scalar(@delrepos));
if (@delrepos == 1) {
&webmin_log($mode, 'repo', $delrepos[0]->{'id'});
}
else {
&webmin_log($mode, 'repos', scalar(@delrepos));
}
&redirect("index.cgi?tab=repos");
}
else {
@@ -30,7 +35,12 @@ else {
foreach my $repo (@delrepos) {
&software::delete_package_repo($repo);
}
&webmin_log('delete', 'repos', scalar(@delrepos));
if (@delrepos == 1) {
&webmin_log('delete', 'repo', $delrepos[0]->{'id'});
}
else {
&webmin_log('delete', 'repos', scalar(@delrepos));
}
&redirect("index.cgi?tab=repos");
}
else {