From: Vincent Vanwaelscappel Date: Thu, 26 Jan 2023 14:50:42 +0000 (+0100) Subject: wip #5700 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9e08ef279cd7141c7550d1e6f520024d7d9ac0be;p=fluidbook-toolbox.git wip #5700 @0.5 --- diff --git a/app/Models/FluidbookExternalInstallServer.php b/app/Models/FluidbookExternalInstallServer.php index 058c9215c..caec2f7c0 100644 --- a/app/Models/FluidbookExternalInstallServer.php +++ b/app/Models/FluidbookExternalInstallServer.php @@ -3,6 +3,7 @@ namespace App\Models; use Cubist\Backpack\Magic\Models\ExternalServer; +use Cubist\Net\Transfer\Local; class FluidbookExternalInstallServer extends ExternalServer { @@ -15,6 +16,17 @@ class FluidbookExternalInstallServer extends ExternalServer public function getProtocols() { - return parent::getProtocols()+['hosting' => 'Hosting']; + return parent::getProtocols() + ['hosting' => 'Hosting']; + } + + public function getTransferDriver($protocol) + { + $res = parent::getTransferDriver($protocol); + if (null !== $res) { + return $res; + } + if ($this->getProtocol() === 'hosting') { + return new Local($this, '/mnt/sshfs/fluidbook/data/fluidbook/hosting/'); + } } } diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php index 872cd8bcc..aae4b4b72 100644 --- a/app/Models/Traits/PublicationSettings.php +++ b/app/Models/Traits/PublicationSettings.php @@ -7,6 +7,7 @@ use App\Fields\FluidbookSignature; use App\Fields\SCORMVersion; use App\Models\FluidbookExternalInstallServer; use Cubist\Backpack\Magic\Fields\Checkbox; +use Cubist\Backpack\Magic\Fields\ExternalPath; use Cubist\Backpack\Magic\Fields\FilesOrURL; use Cubist\Backpack\Magic\Fields\FormSection; use Cubist\Backpack\Magic\Fields\FormSeparator; @@ -2984,7 +2985,7 @@ L,index', 'translatable' => false, ]); if ($downloadVersion['install']) { - $this->addField('install_' . $name, ExternalPath::class, $installField['label'], ['default' => '', 'fake' => true, 'translatable' => false, 'store_in' => 'settings', 'servers_model' => FluidbookExternalInstallServer::class, 'when' => ['download_' . $name => 1]]); + $this->addField('install_' . $name, ExternalPath::class, 'Installer sur un serveur externe', ['default' => '', 'fake' => true, 'translatable' => false, 'store_in' => 'settings', 'servers_model' => FluidbookExternalInstallServer::class, 'when' => ['download_' . $name => 1]]); } } diff --git a/composer.lock b/composer.lock index 0aafefe5f..6f8d24c71 100644 --- a/composer.lock +++ b/composer.lock @@ -1660,21 +1660,21 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "efe99b4c37bb00e82b0cf36d188a0336776ec205" + "reference": "1890d5c11b12b6524c892e81f9b128f8163003eb" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-b1c1b7.tar", - "reference": "efe99b4c37bb00e82b0cf36d188a0336776ec205", - "shasum": "6ccb4c00284ea5b9c3e9f90541e429cff04bd82d" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-d1bd98.tar", + "reference": "1890d5c11b12b6524c892e81f9b128f8163003eb", + "shasum": "ff090ce2529fce92a3464d160fefcd7a2619601d" }, "require": { "backpack/backupmanager": "^3.0", - "backpack/crud": "^4.1.69", + "backpack/crud": "^4.1.71", "backpack/logmanager": "^4.0", "backpack/permissionmanager": "^6.0", "backpack/revise-operation": "^1.0", - "barryvdh/laravel-debugbar": "^v3.6", + "barryvdh/laravel-debugbar": "^v3.7", "cache/filesystem-adapter": "^1.2", "cache/redis-adapter": "^1.0", "calebporzio/parental": "^v0.11", @@ -1693,13 +1693,13 @@ "fideloper/proxy": "^4.4", "genealabs/laravel-model-caching": "^0.11", "graham-campbell/markdown": "^v13.1", - "laravel-lang/lang": "^10.1", + "laravel-lang/lang": "^10.9", "laravel-lang/publisher": "^10.3", - "laravel/framework": "^v8.83", + "laravel/framework": "^v8.83.27", "lavary/laravel-menu": "^v1.8", "league/commonmark": "^1.6", "spatie/laravel-honeypot": "^4.2", - "spatie/laravel-permission": "^4.4|^5.5", + "spatie/laravel-permission": "^4.4|^5.8", "spatie/laravel-translatable": "^5.2", "swayok/alternative-laravel-cache": "^6.1", "venturecraft/revisionable": "^1.39" @@ -1747,7 +1747,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2023-01-26T08:21:13+00:00" + "time": "2023-01-26T14:26:00+00:00" }, { "name": "cubist/cms-front", @@ -2045,13 +2045,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_net.git", - "reference": "16cd3ea9eee0de7e49de572eeca0f550028d6c5b" + "reference": "ac7cf366bfe62b9e9bf737d53f0e9d0fc68e074e" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-415cad.tar", - "reference": "16cd3ea9eee0de7e49de572eeca0f550028d6c5b", - "shasum": "041dcad0b256c4db623fadce56c64ff13b5fbc69" + "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-ca1732.tar", + "reference": "ac7cf366bfe62b9e9bf737d53f0e9d0fc68e074e", + "shasum": "bf1d65fe567345bec27b9aecbdc8a16fdd3276d3" }, "require": { "ext-ssh2": "*", @@ -2074,7 +2074,7 @@ } ], "description": "net cubist composer package", - "time": "2023-01-20T14:05:05+00:00" + "time": "2023-01-26T14:26:17+00:00" }, { "name": "cubist/pdf", @@ -12891,16 +12891,16 @@ }, { "name": "facade/ignition", - "version": "2.17.6", + "version": "2.17.7", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c" + "reference": "b4f5955825bb4b74cba0f94001761c46335c33e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c", - "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c", + "url": "https://api.github.com/repos/facade/ignition/zipball/b4f5955825bb4b74cba0f94001761c46335c33e9", + "reference": "b4f5955825bb4b74cba0f94001761c46335c33e9", "shasum": "" }, "require": { @@ -12965,7 +12965,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2022-06-30T18:26:59+00:00" + "time": "2023-01-26T12:34:59+00:00" }, { "name": "facade/ignition-contracts", @@ -14058,16 +14058,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.31", + "version": "8.5.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "33c126b09a42de5c99e5e8032b54e8221264a74e" + "reference": "375686930d05c9fd7d20f6e5fc38121e8d7a9d55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/33c126b09a42de5c99e5e8032b54e8221264a74e", - "reference": "33c126b09a42de5c99e5e8032b54e8221264a74e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/375686930d05c9fd7d20f6e5fc38121e8d7a9d55", + "reference": "375686930d05c9fd7d20f6e5fc38121e8d7a9d55", "shasum": "" }, "require": { @@ -14135,7 +14135,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.31" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.32" }, "funding": [ { @@ -14151,7 +14151,7 @@ "type": "tidelift" } ], - "time": "2022-10-28T05:57:37+00:00" + "time": "2023-01-26T08:30:25+00:00" }, { "name": "psy/psysh", diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index 7d43311ad..42d8e307e 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -89,7 +89,7 @@ @endcan @can('fluidbook-external-install-server:read')
  • {{__('Serveurs externes')}}
    • + class="la las la-server nav-icon"> {{__('Serveurs externes')}} @endcan @can('fluidbook-quote:read')