mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Make ML available after upload and filter-change (#138)

Browse Source
This commit is contained in:
onli 2014-05-29 21:54:26 +02:00
parent 39d5ceaa03
commit 1bce7ec7ec
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/admin/images.inc.php
View File

@ -161,7 +161,7 @@ switch ($serendipity['GET']['adminAction']) {
$properties = serendipity_parsePropertyForm(); $properties = serendipity_parsePropertyForm();
$image_id = $properties['image_id']; $image_id = $properties['image_id'];
$created_thumbnail = true; $created_thumbnail = true;
$data['showML_add'] = showMediaLibrary($messages, true); $data['showML'] = showMediaLibrary($messages, true);
break; break;
} }
@ -359,7 +359,7 @@ switch ($serendipity['GET']['adminAction']) {
foreach($new_media AS $nm) { foreach($new_media AS $nm) {
serendipity_insertMediaProperty('base_hidden', '', $nm['image_id'], $hidden); serendipity_insertMediaProperty('base_hidden', '', $nm['image_id'], $hidden);
} }
$data['showML_add'] = showMediaLibrary(null, true); $data['showML'] = showMediaLibrary(null, true);
} }
$data['messages'] = $messages; $data['messages'] = $messages;
break; break;
@ -675,7 +675,7 @@ switch ($serendipity['GET']['adminAction']) {
default: default:
$data['case_default'] = true; $data['case_default'] = true;
$data['showML_def'] = showMediaLibrary(); $data['showML'] = showMediaLibrary();
break; break;
} }
@ -716,6 +716,11 @@ function showMediaLibrary($messages=false, $addvar_check = false, $smarty_vars =
return $output; return $output;
} }
if (! isset($data['showML'])) {
// alaways having the ML available is useful when switchting the filter after adding an image, thus being i nthe add-case
$data['showML'] = showMediaLibrary();
}
$data['get']['fid'] = $serendipity['GET']['fid']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime $data['get']['fid'] = $serendipity['GET']['fid']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime
$data['get']['only_path'] = $serendipity['GET']['only_path']; // we dont need other GET vars in images.inc.tpl $data['get']['only_path'] = $serendipity['GET']['only_path']; // we dont need other GET vars in images.inc.tpl

4
templates/2k11/admin/images.inc.tpl
View File

@ -61,7 +61,7 @@
<script>location.href="?serendipity[adminModule]=images&serendipity[adminAction]=default";</script> <script>location.href="?serendipity[adminModule]=images&serendipity[adminAction]=default";</script>
<noscript><a class="button_link icon_link standalone" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript> <noscript><a class="button_link icon_link standalone" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=default">{$CONST.DONE}</a></noscript>
{else} {else}
{$showML_add} {$showML}
{/if} {/if}
{/if} {/if}
{if $case_directoryDoDelete} {if $case_directoryDoDelete}
@ -290,5 +290,5 @@
</div> </div>
{/if} {/if}
{if $case_default} {if $case_default}
{if $showML_def}{$showML_def}{/if} {if $showML}{$showML}{/if}
{/if} {/if}