fix #1700 use user_prefs instead of cookies for the view selector in plugin manager

This commit is contained in:
Matthieu Leproux
2022-08-01 17:11:25 +02:00
parent 74e932a5a9
commit 1ed159f7a7
4 changed files with 19 additions and 11 deletions
+1
View File
@@ -195,6 +195,7 @@ $template->assign(
'max_inactive_before_hide' => isset($_GET['show_inactive']) ? 999 : 8, 'max_inactive_before_hide' => isset($_GET['show_inactive']) ? 999 : 8,
'isWebmaster' => (is_webmaster()) ? 1 : 0, 'isWebmaster' => (is_webmaster()) ? 1 : 0,
'ADMIN_PAGE_TITLE' => l10n('Plugins'), 'ADMIN_PAGE_TITLE' => l10n('Plugins'),
'view_selector' => userprefs_get_param('plugin-manager-view', 'classic'),
) )
); );
+15 -7
View File
@@ -226,10 +226,6 @@ function uninstallPlugin(id) {
$(document).ready(function () { $(document).ready(function () {
actualizeFilter(); actualizeFilter();
if (!$.cookie("pwg_plugin_manager_view")) {
$.cookie("pwg_plugin_manager_view", "classic");
}
if ($("#displayClassic").is(":checked")) { if ($("#displayClassic").is(":checked")) {
setDisplayClassic(); setDisplayClassic();
}; };
@@ -244,17 +240,17 @@ $(document).ready(function () {
$("#displayClassic").change(function () { $("#displayClassic").change(function () {
setDisplayClassic(); setDisplayClassic();
$.cookie("pwg_plugin_manager_view", "classic"); set_view_selector('classic');
}) })
$("#displayCompact").change(function () { $("#displayCompact").change(function () {
setDisplayCompact(); setDisplayCompact();
$.cookie("pwg_plugin_manager_view", "compact"); set_view_selector('compact');
}) })
$("#displayLine").change(function () { $("#displayLine").change(function () {
setDisplayLine(); setDisplayLine();
$.cookie("pwg_plugin_manager_view", "line"); set_view_selector('line');
}) })
/* Plugin Filters */ /* Plugin Filters */
@@ -425,6 +421,18 @@ $(document).ready(function () {
}) })
}) })
function set_view_selector(view_type) {
$.ajax({
url: "ws.php?format=json&method=pwg.users.preferences.set",
type: "POST",
dataType: "JSON",
data: {
param: 'plugin-manager-view',
value: view_type,
}
})
}
// TPL part : // TPL part :
const queuedManager = jQuery.manageAjax.create("queued", { const queuedManager = jQuery.manageAjax.create("queued", {
@@ -39,6 +39,7 @@ const nothing_found = '{'No plugins found'|@translate|@escape:'javascript'}';
const x_plugins_found = '{'%s plugins found'|@translate|@escape:'javascript'}'; const x_plugins_found = '{'%s plugins found'|@translate|@escape:'javascript'}';
const plugin_found = '{'%s plugin found'|@translate|@escape:'javascript'}'; const plugin_found = '{'%s plugin found'|@translate|@escape:'javascript'}';
const isWebmaster = {$isWebmaster}; const isWebmaster = {$isWebmaster};
const view_selector = '{$view_selector}';
const show_details = {if $show_details} true {else} false {/if}; const show_details = {if $show_details} true {else} false {/if};
@@ -64,10 +65,10 @@ let plugin_filter = searchParams.get('filter');
</div> </div>
<div class="AlbumViewSelector"> <div class="AlbumViewSelector">
<input type="radio" name="layout" class="switchLayout" id="displayClassic" {if $smarty.cookies.pwg_plugin_manager_view == 'classic' || !$smarty.cookies.pwg_plugin_manager_view}checked{/if}/><label for="displayClassic"><span class="icon-pause firstIcon tiptip" title="{'Classic View'|translate}"></span></label><input type="radio" name="layout" class="switchLayout" id="displayLine" {if $smarty.cookies.pwg_plugin_manager_view == 'line'}checked{/if}/><label for="displayLine"><span class="icon-th-list tiptip" title="{'Line View'|translate}"></span></label><input type="radio" name="layout" class="switchLayout" id="displayCompact" {if $smarty.cookies.pwg_plugin_manager_view == 'compact'}checked{/if}/><label for="displayCompact"><span class="icon-th-large lastIcon tiptip" title="{'Compact View'|translate}"></span></label> <input type="radio" name="layout" class="switchLayout" id="displayClassic" {if $view_selector == 'classic'}checked{/if}/><label for="displayClassic"><span class="icon-pause firstIcon tiptip" title="{'Classic View'|translate}"></span></label><input type="radio" name="layout" class="switchLayout" id="displayLine" {if $view_selector== 'line'}checked{/if}/><label for="displayLine"><span class="icon-th-list tiptip" title="{'Line View'|translate}"></span></label><input type="radio" name="layout" class="switchLayout" id="displayCompact" {if $view_selector == 'compact'}checked{/if}/><label for="displayCompact"><span class="icon-th-large lastIcon tiptip" title="{'Compact View'|translate}"></span></label>
</div> </div>
<div class="pluginContainer {if $smarty.cookies.pwg_plugin_manager_view == 'classic-form'} classic-form {elseif $smarty.cookies.pwg_plugin_manager_view == 'line-form'} line-form {elseif $smarty.cookies.pwg_plugin_manager_view == 'compact-form'} compact-form {else} {/if}"> <div class="pluginContainer {if $view_selector == 'classic'} classic-form {elseif $view_selector == 'line'} line-form {elseif $view_selector == 'compact'} compact-form {else} {/if}">
{foreach from=$plugins item=plugin name=plugins_loop} {foreach from=$plugins item=plugin name=plugins_loop}
@@ -37,8 +37,6 @@ const str_popin_update_btn = '{'Update'|@translate}';
const view_selector = '{$view_selector}'; const view_selector = '{$view_selector}';
console.log(view_selector);
months = [ months = [
"{'Jan'|@translate}", "{'Jan'|@translate}",
"{'Feb'|@translate}", "{'Feb'|@translate}",