Skip to content

Commit 5316384

Browse files
authored
Merge pull request #6 from openclassify/versions-removed
version-removed
2 parents cf9d524 + da73e49 commit 5316384

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

src/File/FileModel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class FileModel extends FilesFilesEntryModel implements FileInterface
2828
*
2929
* @var bool
3030
*/
31-
protected $versionable = true;
31+
protected $versionable = false;
3232

3333
/**
3434
* Always eager load these.

src/FilesModuleServiceProvider.php

+35-35
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class FilesModuleServiceProvider extends AddonServiceProvider
5858
* @var array
5959
*/
6060
protected $bindings = [
61-
FilesFilesEntryModel::class => FileModel::class,
62-
FilesDisksEntryModel::class => DiskModel::class,
61+
FilesFilesEntryModel::class => FileModel::class,
62+
FilesDisksEntryModel::class => DiskModel::class,
6363
FilesFoldersEntryModel::class => FolderModel::class,
6464
];
6565

@@ -69,8 +69,8 @@ class FilesModuleServiceProvider extends AddonServiceProvider
6969
* @var array
7070
*/
7171
protected $singletons = [
72-
FileRepositoryInterface::class => FileRepository::class,
73-
DiskRepositoryInterface::class => DiskRepository::class,
72+
FileRepositoryInterface::class => FileRepository::class,
73+
DiskRepositoryInterface::class => DiskRepository::class,
7474
FolderRepositoryInterface::class => FolderRepository::class,
7575
];
7676

@@ -80,57 +80,57 @@ class FilesModuleServiceProvider extends AddonServiceProvider
8080
* @var array
8181
*/
8282
protected $routes = [
83-
'admin/files' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@index',
84-
'admin/files/where' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@where',
85-
'admin/files/move' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@move',
86-
'admin/files/upload/choose' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@choose',
87-
'admin/files/upload/handle' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@upload',
88-
'admin/files/upload/recent' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@recent',
89-
'admin/files/upload/{folder}' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@index',
90-
'admin/files/edit/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@edit',
91-
'admin/files/view/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@view',
92-
'admin/files/exists/{folder}' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@exists',
93-
'admin/files/folders' => 'Anomaly\FilesModule\Http\Controller\Admin\FoldersController@index',
94-
'admin/files/folders/create' => 'Anomaly\FilesModule\Http\Controller\Admin\FoldersController@create',
95-
'admin/files/folders/edit/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\FoldersController@edit',
96-
'admin/files/disks' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@index',
97-
'admin/files/disks/choose' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@choose',
98-
'admin/files/disks/create' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@create',
99-
'admin/files/disks/edit/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@edit',
83+
'admin/files' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@index',
84+
'admin/files/where' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@where',
85+
'admin/files/move' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@move',
86+
'admin/files/upload/choose' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@choose',
87+
'admin/files/upload/handle' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@upload',
88+
'admin/files/upload/recent' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@recent',
89+
'admin/files/upload/{folder}' => 'Anomaly\FilesModule\Http\Controller\Admin\UploadController@index',
90+
'admin/files/edit/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@edit',
91+
'admin/files/view/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@view',
92+
'admin/files/exists/{folder}' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@exists',
93+
'admin/files/folders' => 'Anomaly\FilesModule\Http\Controller\Admin\FoldersController@index',
94+
'admin/files/folders/create' => 'Anomaly\FilesModule\Http\Controller\Admin\FoldersController@create',
95+
'admin/files/folders/edit/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\FoldersController@edit',
96+
'admin/files/disks' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@index',
97+
'admin/files/disks/choose' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@choose',
98+
'admin/files/disks/create' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@create',
99+
'admin/files/disks/edit/{id}' => 'Anomaly\FilesModule\Http\Controller\Admin\DisksController@edit',
100100
'admin/files/upload/{disk}/{path?}' => [
101-
'uses' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@upload',
101+
'uses' => 'Anomaly\FilesModule\Http\Controller\Admin\FilesController@upload',
102102
'constraints' => [
103103
'disk' => '^[a-z0-9_]+$',
104104
'path' => '(.*)',
105105
],
106106
],
107-
'files/{folder}/{name}' => [
108-
'as' => 'anomaly.module.files::files.view',
109-
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@read',
107+
'files/{folder}/{name}' => [
108+
'as' => 'anomaly.module.files::files.view',
109+
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@read',
110110
'constraints' => [
111111
'disk' => '^[a-z0-9_]+$',
112112
'path' => '(.*)',
113113
],
114114
],
115-
'files/thumb/{folder}/{name}' => [
116-
'as' => 'anomaly.module.files::files.thumbnail',
117-
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@thumbnail',
115+
'files/thumb/{folder}/{name}' => [
116+
'as' => 'anomaly.module.files::files.thumbnail',
117+
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@thumbnail',
118118
'constraints' => [
119119
'disk' => '^[a-z0-9_]+$',
120120
'path' => '(.*)',
121121
],
122122
],
123-
'files/stream/{folder}/{name}' => [
124-
'as' => 'anomaly.module.files::files.stream',
125-
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@stream',
123+
'files/stream/{folder}/{name}' => [
124+
'as' => 'anomaly.module.files::files.stream',
125+
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@stream',
126126
'constraints' => [
127127
'disk' => '^[a-z0-9_]+$',
128128
'path' => '(.*)',
129129
],
130130
],
131-
'files/download/{folder}/{name}' => [
132-
'as' => 'anomaly.module.files::files.download',
133-
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@download',
131+
'files/download/{folder}/{name}' => [
132+
'as' => 'anomaly.module.files::files.download',
133+
'uses' => 'Anomaly\FilesModule\Http\Controller\FilesController@download',
134134
'constraints' => [
135135
'disk' => '^[a-z0-9_]+$',
136136
'path' => '(.*)',
@@ -147,7 +147,7 @@ class FilesModuleServiceProvider extends AddonServiceProvider
147147
*/
148148
public function map(FieldRouter $fields, VersionRouter $versions, AssignmentRouter $assignments)
149149
{
150-
$versions->route($this->addon, VersionsController::class);
150+
//$versions->route($this->addon, VersionsController::class);
151151

152152
$fields->route($this->addon, FieldsController::class);
153153
$assignments->route($this->addon, AssignmentsController::class, 'admin/files/folders');

0 commit comments

Comments
 (0)