fixed routes permissions

BenHUET · Mar 8, 2017 · 64f4c7d · 64f4c7d
1 parent e3ef0d6
commit 64f4c7d
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 24 deletions.
diff --git a/src/Http/Controllers/OperationController.php b/src/Http/Controllers/OperationController.php
@@ -145,7 +145,7 @@ public function update(Request $request)
 			return $operation;
 		}
 
-		return redirect()->route('auth.unauthorized');
+		return redirect()->back('error', 'An error occurred while processing the request.');
 	}
 
 	public function delete(Request $request)
@@ -154,11 +154,11 @@ public function delete(Request $request)
 		if ($operation != null) {
 			if (auth()->user()->has('calendar.deleteAll') || $operation->user->id == auth()->user()->id) {
 				Operation::destroy($operation->id);
-				return redirect()->back();
+				return redirect()->route('operation.index');
 			}
 		}
 
-		return redirect()->route('auth.unauthorized');
+		return redirect()->back('error', 'An error occurred while processing the request.');
 	}
 
 	public function close(Request $request)
@@ -170,11 +170,11 @@ public function close(Request $request)
 				$operation->end_at = Carbon::now('UTC');
 				$operation->save();
 
-				return redirect()->back();
+				return redirect()->route('operation.index');
 			}
 		}
 
-		return redirect()->route('auth.unauthorized');
+		return redirect()->back('error', 'An error occurred while processing the request.');
 	}
 
 	public function cancel(Request $request)
@@ -188,11 +188,11 @@ public function cancel(Request $request)
 				$operation->notify = $request->get('notify');
 				$operation->save();
 
-				return redirect()->back();
+				return redirect()->route('operation.index');
 			}
 		}
 
-		return redirect()->route('auth.unauthorized');
+		return redirect()->back('error', 'An error occurred while processing the request.');
 	}
 
 	public function activate(Request $request) 
@@ -206,11 +206,11 @@ public function activate(Request $request)
 				$operation->notify = $request->get('notify');
 				$operation->save();
 
-				return redirect()->back();
+				return redirect()->route('operation.index');
 			}
 		}
 
-		return redirect()->route('auth.unauthorized');
+		return redirect()->back('error', 'An error occurred while processing the request.');
 	}
 
 	public function subscribe(Request $request)
@@ -230,11 +230,11 @@ public function subscribe(Request $request)
 						'comment' => $request->comment
 					]
 				);
-				return redirect()->back();
+				return redirect()->route('operation.index');
 			}
 		}
 
-		return redirect()->route('auth.unauthorized');
+		return redirect()->back('error', 'An error occurred while processing the request.');
 	}
 
 	public function find($operation_id) {
@@ -243,7 +243,7 @@ public function find($operation_id) {
 			return response()->json($operation);
 		}
 
-		return redirect()->route('auth.unauthorized');
+		return redirect()->back('error', 'An error occurred while processing the request.');
 	}
 
 }
diff --git a/src/Http/routes.php b/src/Http/routes.php
@@ -7,7 +7,10 @@
 ], function () {
 
 	Route::resource('operation', 'OperationController', [
-		'only' => ['index', 'store']
+		'only' => ['index', 'store'],
+		'names' => [
+			'index' => 'operation.index'
+		]
 	]);
 
 	Route::post('operation/subscribe', [

diff --git a/src/resources/views/operation/includes/modals/confirm_activate.blade.php b/src/resources/views/operation/includes/modals/confirm_activate.blade.php
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmActivate" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmActivate">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 

diff --git a/src/resources/views/operation/includes/modals/confirm_cancel.blade.php b/src/resources/views/operation/includes/modals/confirm_cancel.blade.php
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmCancel" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmCancel">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 

diff --git a/src/resources/views/operation/includes/modals/confirm_close.blade.php b/src/resources/views/operation/includes/modals/confirm_close.blade.php
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmClose" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmClose">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 

diff --git a/src/resources/views/operation/includes/modals/confirm_delete.blade.php b/src/resources/views/operation/includes/modals/confirm_delete.blade.php
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmDelete" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" tabindex="-1" role="dialog" id="modalConfirmDelete">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 

diff --git a/src/resources/views/operation/includes/modals/create_operation.blade.php b/src/resources/views/operation/includes/modals/create_operation.blade.php
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="modalCreateOperation" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" tabindex="-1" role="dialog" id="modalCreateOperation">
 	<div class="modal-dialog modal-lg" role="document">
 		<div class="modal-content">
 			<div class="modal-header modal-calendar modal-calendar-green">

diff --git a/src/resources/views/operation/includes/modals/details.blade.php b/src/resources/views/operation/includes/modals/details.blade.php
@@ -1,5 +1,5 @@
 @foreach($ops_all as $op)
-	<div class="modal fade @if($default_op == $op->id) default-op @endif" tabindex="-1" role="dialog" id="modalDetails-{{ $op->id }}" data-backdrop="static" data-keyboard="false">
+	<div class="modal fade @if($default_op == $op->id) default-op @endif" tabindex="-1" role="dialog" id="modalDetails-{{ $op->id }}">
 		<div class="modal-dialog modal-lg" role="document">
 			<div class="modal-content">
 
@@ -113,9 +113,11 @@
 
 					<h3 style="display: inline;">{{ trans('calendar::seat.attendees') }}</h3>
 					<div class="pull-right">
-						<button type="button" class="btn btn-primary btn-xs" data-dismiss="modal" data-toggle="modal" data-op-id="{{ $op->id }}" data-target="#modalSubscribe">
-							<i class="fa fa-reply"></i>&nbsp;&nbsp; Subscribe
-						</button>
+						@if($op->status == 'incoming')
+							<button type="button" class="btn btn-primary btn-xs" data-dismiss="modal" data-toggle="modal" data-op-id="{{ $op->id }}" data-target="#modalSubscribe">
+								<i class="fa fa-reply"></i>&nbsp;&nbsp; Subscribe
+							</button>
+						@endif
 						@include('calendar::operation.includes.attendees')
 					</div>
 

diff --git a/src/resources/views/operation/includes/modals/subscribe.blade.php b/src/resources/views/operation/includes/modals/subscribe.blade.php
@@ -1,4 +1,4 @@
-<div class="modal fade modal-subscribe" tabindex="-1" role="dialog" id="modalSubscribe" data-backdrop="static" data-keyboard="false">
+<div class="modal fade modal-subscribe" tabindex="-1" role="dialog" id="modalSubscribe">
 	<div class="modal-dialog modal-lg" role="document">
 		<div class="modal-content">
 

diff --git a/src/resources/views/operation/includes/modals/update_operation.blade.php b/src/resources/views/operation/includes/modals/update_operation.blade.php
@@ -1,4 +1,4 @@
-<div class="modal fade" tabindex="-1" role="dialog" id="modalUpdateOperation" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" tabindex="-1" role="dialog" id="modalUpdateOperation">
 	<div class="modal-dialog modal-lg" role="document">
 		<div class="modal-content">