Skip to content

Commit f2c1e0e

Browse files
committed
Tab switching "x records" message is resetting from now on. Added "do nothing" for batch operations. Closes hestiacp#15
1 parent c8c8e90 commit f2c1e0e

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

web/index.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
217217
<div id="batch-processor" class="b-row-selector">
218218
<div class="checkbox-selector cc">
219219
<input class="styled do_action_toggle_batch_selector" autocomplete="off" type="checkbox" value="" />
220-
<span class="selector-title">All</span>
220+
<span class="selector-title">None</span>
221221
</div>
222222
<div class="context-actions c-s-box">
223223
<div class="b-cust-sel complex-select c-s-opt">
@@ -226,6 +226,10 @@ <h1 class="logo"><a href="/">Vesta panel <span>&nbsp;</span></a></h1>
226226
<div class="cust-sel-arrow do_action_toggle_custom_select c-s-opt"><i class="do_action_toggle_custom_select">&nbsp;</i></div>
227227
<div class="cust-sel-options complex-select-content c-s-opt hidden">
228228
<div class="cust-sel-option ico_gray c-s-opt do_action_update_cs_value">
229+
<input type="hidden" class="c-s-value" value="Nothing">
230+
Nothing
231+
</div>
232+
<div class="cust-sel-option ico_gray c-s-opt do_action_update_cs_value">
229233
<input type="hidden" class="c-s-value" value="Suspend">
230234
Suspend
231235
</div>

web/js/actions.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ App.Actions.update_cs_value = function(evt)
5454
var val = elm.find('.c-s-value').val();
5555
$('.complex-select-content').addClass('hidden');
5656

57+
if (val.toLowerCase() == 'nothing') {
58+
App.Actions.mass_nothing();
59+
return;
60+
}
61+
5762
if (App.Tmp[App.Env.world + '_selected_records'] > 0) {
5863
var confirm_message_key = App.Tmp[App.Env.world + '_selected_records'] == 1 ? 1 + ' record' : App.Tmp[App.Env.world + '_selected_records'] + ' records';
5964
var confirmed = confirm('This action will ' + val.toLowerCase() + ' ' + confirm_message_key + '. Do you want to proceede?');
@@ -83,6 +88,11 @@ App.Actions.mass_unsuspend = function()
8388
App.Actions.reset_batch();
8489
}
8590

91+
App.Actions.mass_nothing = function()
92+
{
93+
$('.complex-select-content').addClass('hidden');
94+
}
95+
8696
App.Actions.mass_action = function(method_name)
8797
{
8898
var rows = $('.checked-row');

web/js/pages.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
App.Pages.init = function()
22
{
3-
if ('undefined' == typeof App.Env.initialParams) {
3+
if ('undefined' == typeof App.Env.initialParams) { // first run
44
App.Ajax.request('MAIN.getInitial', {}, function(reply) {
55
App.Env.initialParams = reply.data;
66
App.Helpers.updateInitial();
7-
});
7+
if (!App.Env.initialParams.auth_user.admin) {
8+
var head= document.getElementsByTagName('head')[0];
9+
var script= document.createElement('script');
10+
script.type= 'text/javascript';
11+
script.src= App.Helpers.generateUrl('js/user_templates.js?'+Math.random());
12+
head.appendChild(script);
13+
}
14+
});
815
}
916

1017
App.Pages.prepareHTML();
@@ -18,6 +25,7 @@ App.Pages.init = function()
1825

1926
App.Pages.prepareHTML = function()
2027
{
28+
App.Actions.reset_batch();
2129
$('#actions-toolbar .stats-subbar').remove();
2230
$('#actions-toolbar .do_action_new_entry').removeClass('hidden');
2331
$('.active').removeClass('active');

0 commit comments

Comments
 (0)