TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecated Cms\Controllers\Media in favour of the backend one. Fixed other references to moved pieces of the Media Manager. Finally a proper fix for https://github.com/octobercms/october/pull/2604

This commit is contained in:
Luke Towers 2017-10-08 23:12:04 -06:00
parent 7830f89fa9
commit 4203e65549
6 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend/classes/Controller.php
View File

@ -14,7 +14,7 @@ use Exception;
use BackendAuth;
use Backend\Models\UserPreference;
use Backend\Models\Preference as BackendPreference;
use Cms\Widgets\MediaManager;
use Backend\Widgets\MediaManager;
use October\Rain\Exception\AjaxException;
use October\Rain\Exception\SystemException;
use October\Rain\Exception\ValidationException;
@ -152,11 +152,7 @@ class Controller extends Extendable
/*
* Media Manager widget is available on all back-end pages
*/
if (
class_exists('Cms\Widgets\MediaManager') &&
$this->user &&
$this->user->hasAccess('media.*')
) {
if ($this->user && $this->user->hasAccess('media.*')) {
$manager = new MediaManager($this, 'ocmediamanager');
$manager->bindToController();
}

8
modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm
View File

@ -1,12 +1,12 @@
<?php
$selectionModes = [
Cms\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('cms::lang.media.selection_mode_normal'),
Cms\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('cms::lang.media.selection_mode_fixed_ratio'),
Cms\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('cms::lang.media.selection_mode_fixed_size')
Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('cms::lang.media.selection_mode_normal'),
Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('cms::lang.media.selection_mode_fixed_ratio'),
Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('cms::lang.media.selection_mode_fixed_size')
];
$sizeDisabledAttr = $currentSelectionMode == Cms\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
$sizeDisabledAttr = $currentSelectionMode == Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
?>
<div class="control-toolbar toolbar-padded">

2
modules/backend/widgets/mediamanager/partials/_filters.htm
View File

@ -2,7 +2,7 @@
<ul class="nav nav-stacked selector-group">
<li role="presentation" <?php if ($currentFilter == Cms\Widgets\MediaManager::FILTER_EVERYTHING): ?>class="active"<?php endif ?>>
<a href="#" data-command="set-filter" data-filter="<?= Cms\Widgets\MediaManager::FILTER_EVERYTHING ?>">
<a href="#" data-command="set-filter" data-filter="<?= Backend\Widgets\MediaManager::FILTER_EVERYTHING ?>">
<i class="icon-recycle"></i>
<?= e(trans('cms::lang.media.filter_everything')) ?>

4
modules/backend/widgets/mediamanager/partials/_item-list.htm
View File

@ -6,9 +6,9 @@
<div class="empty-library"><?= e(trans('cms::lang.media.empty_library')) ?></div>
<?php endif ?>
<?php if ($viewMode == Cms\Widgets\MediaManager::VIEW_MODE_GRID): ?>
<?php if ($viewMode == Backend\Widgets\MediaManager::VIEW_MODE_GRID): ?>
<?= $this->makePartial('list-grid') ?>
<?php elseif ($viewMode == Cms\Widgets\MediaManager::VIEW_MODE_LIST): ?>
<?php elseif ($viewMode == Backend\Widgets\MediaManager::VIEW_MODE_LIST): ?>
<?= $this->makePartial('list-list') ?>
<?php else: ?>
<?= $this->makePartial('list-tiles') ?>

12
modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm
View File

@ -1,18 +1,18 @@
<button
type="button"
class="btn btn-default oc-icon-align-justify empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_GRID ? 'on' : '' ?>"
class="btn btn-default oc-icon-align-justify empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_GRID ? 'on' : '' ?>"
data-command="change-view"
data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_GRID ?>">
data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_GRID ?>">
</button>
<button
type="button"
class="btn btn-default oc-icon-th empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_LIST ? 'on' : '' ?>"
class="btn btn-default oc-icon-th empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_LIST ? 'on' : '' ?>"
data-command="change-view"
data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_LIST ?>">
data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_LIST ?>">
</button>
<button
type="button"
class="btn btn-default oc-icon-th-large empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_TILES ? 'on' : '' ?>"
class="btn btn-default oc-icon-th-large empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_TILES ? 'on' : '' ?>"
data-command="change-view"
data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_TILES ?>">
data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_TILES ?>">
</button>

3
modules/cms/controllers/Media.php
View File

@ -1,6 +1,6 @@
<?php namespace Cms\Controllers;
use Backend\Controllers\Media;
use Backend\Controllers\Media as MediaController;
/**
* CMS Media Manager
@ -16,6 +16,7 @@ class Media extends MediaController
*/
public function __construct()
{
traceLog('Controller Cms\Controllers\Media has been deprecated, use Backend\Controller\Media instead.');
parent::__construct();
}
}