Merge pull request #226 from dbarzin/dev

Dev
dbarzin · Nov 12, 2024 · e514e3b · e514e3b
2 parents f1e5de5 + 6302e43
commit e514e3b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/...Http/Controllers/ActionplanController.php → app/Http/Controllers/ActionController.php b/...Http/Controllers/ActionplanController.php → app/Http/Controllers/ActionController.php
@@ -12,7 +12,7 @@
 use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
 
-class ActionplanController extends Controller
+class ActionController extends Controller
 {
     /**
      * Display a listing of the resource.

diff --git a/docker/Dockerfile_web b/docker/Dockerfile_web
@@ -15,8 +15,6 @@ RUN apt-get install -y --no-install-recommends \
     php-curl=2:8.2* \
     php-xml=2:8.2* \
     mariadb-server \
-    postfix \
-    mailutils \
     cron \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 

diff --git a/routes/web.php b/routes/web.php
@@ -98,17 +98,17 @@
     Route::resource('users', 'UserController');
 
     /* Actions */
-    Route::get('/actions', 'ActionplanController@index');
-    Route::get('/action/show/{id}', 'ActionplanController@show');
-    Route::get('/action/create', 'ActionplanController@create');
-    Route::get('/action/edit/{id}', 'ActionplanController@edit');
-    Route::get('/action/close/{id}', 'ActionplanController@close');
-
-    Route::post('/action/store', 'ActionplanController@store');
-    Route::post('/action/update', 'ActionplanController@update');
-    Route::post('/action/save', 'ActionplanController@save');
-    Route::post('/action/close', 'ActionplanController@doClose');
-    Route::post('/action/delete', 'ActionplanController@delete');
+    Route::get('/actions', 'ActionController@index');
+    Route::get('/action/show/{id}', 'ActionController@show');
+    Route::get('/action/create', 'ActionController@create');
+    Route::get('/action/edit/{id}', 'ActionController@edit');
+    Route::get('/action/close/{id}', 'ActionController@close');
+
+    Route::post('/action/store', 'ActionController@store');
+    Route::post('/action/update', 'ActionController@update');
+    Route::post('/action/save', 'ActionController@save');
+    Route::post('/action/close', 'ActionController@doClose');
+    Route::post('/action/delete', 'ActionController@delete');
 
     /* Reports */
     Route::get('/reports', 'ReportController@show');
@@ -120,5 +120,5 @@
     Route::get('/export/attributes', 'AttributeController@export');
     Route::get('/export/alices', 'MeasureController@export');
     Route::get('/export/bobs', 'ControlController@export');
-    Route::get('/export/actions', 'ActionplanController@export');
+    Route::get('/export/actions', 'ActionController@export');
 });