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

Merge branch 'develop' into l55upgrade

This commit is contained in:
Samuel Georges 2017-05-20 09:08:09 +10:00
parent 6136e89a54 25bcc35020
commit bab7976331
19 changed files with 181 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/backend/behaviors/ListController.php
View File

@ -241,6 +241,13 @@ class ListController extends ControllerBehavior
return $widget->onRefresh();
});
/*
* Filter Widget with extensibility
*/
$filterWidget->bindEvent('filter.extendScopes', function () use ($filterWidget) {
$this->controller->listFilterExtendScopes($filterWidget);
});
/*
* Extend the query of the list of options
*/
@ -449,6 +456,15 @@ class ListController extends ControllerBehavior
public function listExtendColumns($host)
{
}
/**
* Called after the filter scopes are defined.
* @param \Backend\Widgets\Filter $host The hosting filter widget
* @return void
*/
public function listFilterExtendScopes($host)
{
}
/**
* Controller override: Extend supplied model
@ -543,4 +559,20 @@ class ListController extends ControllerBehavior
call_user_func_array($callback, [$widget, $widget->model]);
});
}
/**
* Static helper for extending filter scopes.
* @param callable $callback
* @return void
*/
public static function extendListFilterScopes($callback)
{
$calledClass = self::getCalledExtensionClass();
Event::listen('backend.filter.extendScopes', function ($widget) use ($calledClass, $callback) {
if (!is_a($widget->getController(), $calledClass)) {
return;
}
call_user_func_array($callback, [$widget]);
});
}
}

6
modules/backend/formwidgets/repeater/partials/_repeater.htm
View File

@ -53,8 +53,8 @@
data-request="<?= $this->getEventHandler('onAddItem') ?>"
data-request-data="_repeater_group: '<?= $item['code'] ?>'">
<i class="list-icon <?= $item['icon'] ?>"></i>
<span class="title"><?= $item['name'] ?></span>
<span class="description"><?= $item['description'] ?></span>
<span class="title"><?= e(trans($item['name'])) ?></span>
<span class="description"><?= e(trans($item['description'])) ?></span>
<span class="borders"></span>
</a>
</li>
@ -67,4 +67,4 @@
</div>
</script>
</div>
</div>

2
modules/cms/classes/ComponentBase.php
View File

@ -260,7 +260,7 @@ abstract class ComponentBase extends Extendable
public function __call($method, $parameters)
{
try {
parent::__call($method, $parameters);
return parent::__call($method, $parameters);
}
catch (BadMethodCallException $ex) {}

7
modules/cms/classes/Page.php
View File

@ -4,6 +4,7 @@ use Lang;
use Cms\Classes\Theme;
use Cms\Classes\Layout;
use ApplicationException;
use October\Rain\Filesystem\Definitions as FileDefinitions;
/**
* The CMS page class.
@ -88,8 +89,14 @@ class Page extends CmsCompoundObject
$layouts = Layout::listInTheme($theme, true);
$result = [];
$result[null] = Lang::get('cms::lang.page.no_layout');
foreach ($layouts as $layout) {
$baseName = $layout->getBaseFileName();
if (FileDefinitions::isPathIgnored($baseName)) {
continue;
}
$result[$baseName] = strlen($layout->name) ? $layout->name : $baseName;
}

4
modules/cms/lang/en/lang.php
View File

@ -284,7 +284,7 @@ return [
'size' => 'Size',
'title' => 'Title',
'last_modified' => 'Last modified',
'public_url' => 'Public URL',
'public_url' => 'Download URL',
'click_here' => 'Click here',
'thumbnail_error' => 'Error generating thumbnail.',
'return_to_parent' => 'Return to the parent folder',
@ -310,7 +310,7 @@ return [
'move_destination' => 'Destination folder',
'please_select_move_dest' => 'Please select a destination folder.',
'move_dest_src_match' => 'Please select another destination folder.',
'empty_library' => 'The Media Library is empty. Upload files or create folders to get started.',
'empty_library' => 'It looks a bit empty here. Upload files or create folders to get started.',
'insert' => 'Insert',
'crop_and_insert' => 'Crop & Insert',
'select_single_image' => 'Please select a single image.',

2
modules/cms/models/ThemeData.php
View File

@ -154,7 +154,7 @@ class ThemeData extends Model
$result = [];
foreach ($this->getFormFields() as $attribute => $field) {
if (!$value = array_get($field, 'default')) {
if (($value = array_get($field, 'default')) === null) {
continue;
}

11
modules/cms/widgets/MediaManager.php
View File

@ -6,6 +6,7 @@ use Lang;
use File;
use Form;
use Input;
use Config;
use Request;
use Response;
use Exception;
@ -872,7 +873,9 @@ class MediaManager extends WidgetBase
{
$fileName = md5($fileName.uniqid().microtime());
$path = temp_path() . '/media';
$mediaFolder = Config::get('cms.storage.media.folder', 'media');
$path = temp_path() . MediaLibrary::validatePath($mediaFolder, true);
if (!File::isDirectory($path)) {
File::makeDirectory($path, 0777, true, true);
@ -883,7 +886,11 @@ class MediaManager extends WidgetBase
protected function getThumbnailDirectory()
{
return '/public/';
/*
* NOTE: Custom routing for /storage/temp/$thumbnailDirectory must be setup
* to return the thumbnail if not using default 'public' directory
*/
return MediaLibrary::validatePath(Config::get('cms.storage.media.thumbFolder', 'public'), true) . '/';
}
protected function getPlaceholderId($item)

5
modules/cms/widgets/mediamanager/assets/js/mediamanager-browser-min.js vendored
View File

@ -343,7 +343,8 @@ $.oc.confirm(this.options.deleteConfirm,this.proxy(this.deleteConfirmation))}
MediaManager.prototype.deleteConfirmation=function(confirmed){if(!confirmed)
return
var items=this.$el.get(0).querySelectorAll('[data-type="media-item"].selected'),paths=[]
for(var i=0,len=items.length;i<len;i++){paths.push({'path':items[i].getAttribute('data-path'),'type':items[i].getAttribute('data-item-type')})}
for(var i=0,len=items.length;i<len;i++){if(items[i].hasAttribute('data-root')){continue;}
paths.push({'path':items[i].getAttribute('data-path'),'type':items[i].getAttribute('data-item-type')})}
var data={paths:paths}
$.oc.stripeLoadIndicator.show()
this.$form.request(this.options.alias+'::onDeleteItem',{data:data}).always(function(){$.oc.stripeLoadIndicator.hide()}).done(this.proxy(this.afterNavigate))}
@ -659,4 +660,4 @@ case'undo-resizing':this.undoResizing()
break}}
MediaManagerImageCropPopup.prototype.onSelectionChanged=function(c){this.updateSelectionSizeLabel(c.w,c.h)}
MediaManagerImageCropPopup.DEFAULTS={alias:undefined,onDone:undefined}
$.oc.mediaManager.imageCropPopup=MediaManagerImageCropPopup}(window.jQuery);
$.oc.mediaManager.imageCropPopup=MediaManagerImageCropPopup}(window.jQuery);

46
modules/cms/widgets/mediamanager/assets/js/mediamanager.js
View File

@ -199,7 +199,7 @@
}
MediaManager.prototype.isSearchMode = function() {
return this.$el.find('[data-type="search-mode"]').val() == 'true'
return this.$el.find('[data-type="search-mode"]').val() == 'true'
}
MediaManager.prototype.initScroll = function() {
@ -264,7 +264,7 @@
if (this.isPreviewSidebarVisible()) {
// Use the timeout to prevent too many AJAX requests
// when the selection changes too quickly (with the keyboard arrows)
this.selectTimer = setTimeout(this.proxy(this.updateSidebarPreview), 100)
this.selectTimer = setTimeout(this.proxy(this.updateSidebarPreview), 100)
}
// Disable delete and move buttons
@ -407,7 +407,7 @@
this.resetSearch()
this.gotoFolder($item.data('path'), true)
}
}
}
else if ($item.data('item-type') == 'file') {
// Trigger the Insert popup command if a file item
// was double clicked or Enter key was pressed.
@ -432,7 +432,7 @@
$sidebar.removeClass('hide')
this.updateSidebarPreview()
$button.removeClass('sidebar-hidden')
}
}
else {
$sidebar.addClass('hide')
$button.addClass('sidebar-hidden')
@ -597,8 +597,8 @@
for (var i = (placeholders.length-1); i >= 0; i--)
this.thumbnailQueue.push({
id: placeholders[i].getAttribute('id'),
width: placeholders[i].getAttribute('data-width'),
height: placeholders[i].getAttribute('data-height'),
width: placeholders[i].getAttribute('data-width'),
height: placeholders[i].getAttribute('data-height'),
path: placeholders[i].getAttribute('data-path'),
lastModified: placeholders[i].getAttribute('data-last-modified')
})
@ -919,6 +919,10 @@
paths = []
for (var i=0, len=items.length; i<len; i++) {
// Skip the 'return to parent' item
if (items[i].hasAttribute('data-root')) {
continue;
}
paths.push({
'path': items[i].getAttribute('data-path'),
'type': items[i].getAttribute('data-item-type')
@ -1015,7 +1019,7 @@
originalPath: $(ev.target).find('input[name=originalPath]').val(),
files: [],
folders: []
}
}
for (var i = 0, len = items.length; i < len; i++) {
var item = items[i],
@ -1113,9 +1117,9 @@
}
MediaManager.prototype.onItemTouch = function(ev) {
// The 'click' event is triggered after 'touchend',
// The 'click' event is triggered after 'touchend',
// so we can prevent handling it.
ev.preventDefault()
ev.preventDefault()
ev.stopPropagation()
if (this.dblTouchFlag) {
@ -1129,7 +1133,7 @@
this.clearDblTouchTimer()
this.dblTouchTimer = setTimeout(this.proxy(this.clearDblTouchFlag), 300)
this.dblTouchTimer = setTimeout(this.proxy(this.clearDblTouchFlag), 300)
}
MediaManager.prototype.onListMouseDown = function(ev) {
@ -1173,7 +1177,7 @@
if (!ev.shiftKey)
item.setAttribute('class', 'selected')
else {
if (item.getAttribute('class') == 'selected')
if (item.getAttribute('class') == 'selected')
item.setAttribute('class', '')
else
item.setAttribute('class', 'selected')
@ -1198,7 +1202,7 @@
deltaY = relativePosition.y - this.selectionStartPoint.y
if (!this.selectionStarted && (Math.abs(deltaX) > 2 || Math.abs(deltaY) > 2)) {
// Start processing the selection only if the mouse was moved by
// Start processing the selection only if the mouse was moved by
// at least 2 pixels.
this.createSelectionMarker()
@ -1209,20 +1213,20 @@
if (this.selectionStarted) {
if (deltaX >= 0) {
this.selectionMarker.style.left = this.selectionStartPoint.x + 'px'
this.selectionMarker.style.width = deltaX + 'px'
this.selectionMarker.style.left = this.selectionStartPoint.x + 'px'
this.selectionMarker.style.width = deltaX + 'px'
}
else {
this.selectionMarker.style.left = relativePosition.x + 'px'
this.selectionMarker.style.width = Math.abs(deltaX) + 'px'
this.selectionMarker.style.left = relativePosition.x + 'px'
this.selectionMarker.style.width = Math.abs(deltaX) + 'px'
}
if (deltaY >= 0) {
this.selectionMarker.style.height = deltaY + 'px'
this.selectionMarker.style.height = deltaY + 'px'
this.selectionMarker.style.top = this.selectionStartPoint.y + 'px'
}
else {
this.selectionMarker.style.top = relativePosition.y + 'px'
this.selectionMarker.style.top = relativePosition.y + 'px'
this.selectionMarker.style.height = Math.abs(deltaY) + 'px'
}
}
@ -1285,7 +1289,7 @@
var old = $.fn.mediaManager
$.fn.mediaManager = function (option) {
var args = Array.prototype.slice.call(arguments, 1),
var args = Array.prototype.slice.call(arguments, 1),
result = undefined
this.each(function () {
@ -1296,7 +1300,7 @@
if (typeof option == 'string') result = data[option].apply(data, args)
if (typeof result != 'undefined') return false
})
return result ? result : this
}
@ -1317,4 +1321,4 @@
$('div[data-control=media-manager]').mediaManager()
})
}(window.jQuery);
}(window.jQuery);

47
modules/system/classes/UpdateManager.php
View File

@ -31,11 +31,15 @@ class UpdateManager
use \October\Rain\Support\Traits\Singleton;
/**
* The notes for the current operation.
* @var array
* @var array The notes for the current operation.
*/
protected $notes = [];
/**
* @var \Illuminate\Console\OutputStyle
*/
protected $notesOutput;
/**
* @var string Application base path.
*/
@ -376,9 +380,11 @@ class UpdateManager
$this->migrator->run(base_path() . '/modules/'.strtolower($module).'/database/migrations');
$this->note($module);
foreach ($this->migrator->getNotes() as $note) {
$this->note(' - '.$note);
}
return $this;
}
@ -477,13 +483,17 @@ class UpdateManager
return;
}
$this->versionManager->resetNotes();
$this->note($name);
$this->versionManager->resetNotes()->setNotesOutput($this->notesOutput);
if ($this->versionManager->updatePlugin($plugin) !== false) {
$this->note($name);
foreach ($this->versionManager->getNotes() as $note) {
$this->note(' - '.$note);
$this->note($note);
}
}
return $this;
}
@ -700,11 +710,17 @@ class UpdateManager
/**
* Raise a note event for the migrator.
* @param string $message
* @return void
* @return self
*/
protected function note($message)
{
$this->notes[] = $message;
if ($this->notesOutput !== null) {
$this->notesOutput->writeln($message);
}
else {
$this->notes[] = $message;
}
return $this;
}
@ -719,11 +735,26 @@ class UpdateManager
/**
* Resets the notes store.
* @return array
* @return self
*/
public function resetNotes()
{
$this->notesOutput = null;
$this->notes = [];
return $this;
}
/**
* Sets an output stream for writing notes.
* @param Illuminate\Console\Command $output
* @return self
*/
public function setNotesOutput($output)
{
$this->notesOutput = $output;
return $this;
}

34
modules/system/classes/VersionManager.php
View File

@ -36,6 +36,11 @@ class VersionManager
*/
protected $notes = [];
/**
* @var \Illuminate\Console\OutputStyle
*/
protected $notesOutput;
/**
* Cache of plugin versions as files.
*/
@ -85,7 +90,7 @@ class VersionManager
// No updates needed
if ($currentVersion == $databaseVersion) {
$this->note('<info>Nothing to update.</info>');
$this->note('- <info>Nothing to update.</info>');
return;
}
@ -150,7 +155,7 @@ class VersionManager
$this->setDatabaseVersion($code, $version);
$this->note(sprintf('<info>v%s: </info> %s', $version, $comment));
$this->note(sprintf('- <info>v%s: </info> %s', $version, $comment));
}
/**
@ -475,7 +480,13 @@ class VersionManager
*/
protected function note($message)
{
$this->notes[] = $message;
if ($this->notesOutput !== null) {
$this->notesOutput->writeln($message);
}
else {
$this->notes[] = $message;
}
return $this;
}
@ -490,11 +501,26 @@ class VersionManager
/**
* Resets the notes store.
* @return array
* @return self
*/
public function resetNotes()
{
$this->notesOutput = null;
$this->notes = [];
return $this;
}
/**
* Sets an output stream for writing notes.
* @param Illuminate\Console\Command $output
* @return self
*/
public function setNotesOutput($output)
{
$this->notesOutput = $output;
return $this;
}
}

10
modules/system/console/OctoberDown.php
View File

@ -15,7 +15,6 @@ use Symfony\Component\Console\Input\InputArgument;
*/
class OctoberDown extends Command
{
use \Illuminate\Console\ConfirmableTrait;
/**
@ -45,11 +44,10 @@ class OctoberDown extends Command
return;
}
$manager = UpdateManager::instance()->resetNotes()->uninstall();
foreach ($manager->getNotes() as $note) {
$this->output->writeln($note);
}
UpdateManager::instance()
->setNotesOutput($this->output)
->uninstall()
;
}
/**

6
modules/system/console/OctoberInstall.php
View File

@ -291,7 +291,11 @@ class OctoberInstall extends Command
try {
Db::purge();
UpdateManager::instance()->resetNotes()->update();
UpdateManager::instance()
->setNotesOutput($this->output)
->update()
;
}
catch (Exception $ex) {
$this->error($ex->getMessage());

10
modules/system/console/OctoberUp.php
View File

@ -15,7 +15,6 @@ use Symfony\Component\Console\Input\InputArgument;
*/
class OctoberUp extends Command
{
/**
* The console command name.
*/
@ -39,13 +38,12 @@ class OctoberUp extends Command
*/
public function fire()
{
$manager = UpdateManager::instance()->resetNotes()->update();
$this->output->writeln('<info>Migrating application and plugins...</info>');
foreach ($manager->getNotes() as $note) {
$this->output->writeln($note);
}
UpdateManager::instance()
->setNotesOutput($this->output)
->update()
;
}
/**

4
modules/system/console/OctoberUpdate.php
View File

@ -44,7 +44,7 @@ class OctoberUpdate extends Command
public function fire()
{
$this->output->writeln('<info>Updating October...</info>');
$manager = UpdateManager::instance()->resetNotes();
$manager = UpdateManager::instance()->setNotesOutput($this->output);
$forceUpdate = $this->option('force');
/*
@ -66,7 +66,7 @@ class OctoberUpdate extends Command
* Perform update
*/
$updateList = $manager->requestUpdateList($forceUpdate);
$updates = (int)array_get($updateList, 'update', 0);
$updates = (int) array_get($updateList, 'update', 0);
if ($updates == 0) {
$this->output->writeln('<info>No new updates found</info>');

6
modules/system/console/PluginInstall.php
View File

@ -45,7 +45,7 @@ class PluginInstall extends Command
public function fire()
{
$pluginName = $this->argument('name');
$manager = UpdateManager::instance()->resetNotes();
$manager = UpdateManager::instance()->setNotesOutput($this->output);
$pluginDetails = $manager->requestPluginDetails($pluginName);
@ -64,10 +64,6 @@ class PluginInstall extends Command
$this->output->writeln(sprintf('<info>Migrating plugin...</info>', $code));
PluginManager::instance()->loadPlugins();
$manager->updatePlugin($code);
foreach ($manager->getNotes() as $note) {
$this->output->writeln($note);
}
}
/**

19
modules/system/console/PluginRefresh.php
View File

@ -45,26 +45,27 @@ class PluginRefresh extends Command
*/
public function fire()
{
/*
* Lookup plugin
*/
$pluginName = $this->argument('name');
$pluginName = PluginManager::instance()->normalizeIdentifier($pluginName);
if (!PluginManager::instance()->exists($pluginName)) {
throw new \InvalidArgumentException(sprintf('Plugin "%s" not found.', $pluginName));
}
$manager = UpdateManager::instance()->resetNotes();
$manager = UpdateManager::instance()->setNotesOutput($this->output);
/*
* Rollback plugin
*/
$manager->rollbackPlugin($pluginName);
foreach ($manager->getNotes() as $note) {
$this->output->writeln($note);
}
$manager->resetNotes();
/*
* Update plugin
*/
$this->output->writeln('<info>Reinstalling plugin...</info>');
$manager->updatePlugin($pluginName);
foreach ($manager->getNotes() as $note) {
$this->output->writeln($note);
}
}
/**

6
modules/system/console/PluginRemove.php
View File

@ -63,13 +63,9 @@ class PluginRemove extends Command
/*
* Rollback plugin
*/
$manager = UpdateManager::instance()->resetNotes();
$manager = UpdateManager::instance()->setNotesOutput($this->output);
$manager->rollbackPlugin($pluginName);
foreach ($manager->getNotes() as $note) {
$this->output->writeln($note);
}
/*
* Delete from file system
*/

3
modules/system/lang/en/lang.php
View File

@ -25,7 +25,8 @@ return [
'id' => 'Bahasa Indonesia',
'it' => 'Italiano',
'ja' => '日本語',
'lv' => 'Latvijas',
'lt' => 'Lietuvių',
'lv' => 'Latviešu',
'nb-no' => 'Norsk (Bokmål)',
'nl' => 'Nederlands',
'pl' => 'Polskie',