Andrea Pollastri 5 rokov pred
rodič
commit
b320593c4f

+ 2 - 2
app/Http/Controllers/ApplicationsController.php

@@ -32,9 +32,9 @@ class ApplicationsController extends Controller {
             $request->session()->flash('alert-error', 'This domain is already taken on this server');
             $request->session()->flash('alert-error', 'This domain is already taken on this server');
             return redirect('/applications');
             return redirect('/applications');
         }
         }
-        $aliases = Alias::where('domain', $request->domain)->get();
+        $aliases = Alias::where('domain', $request->domain)->with('application')->get();
         foreach($aliases as $alias) {
         foreach($aliases as $alias) {
-            if($alias->application->sever->id == $request->server_id) {
+            if($alias->application->server_id == $request->server_id) {
                 $request->session()->flash('alert-error', 'This domain is already taken on this server');
                 $request->session()->flash('alert-error', 'This domain is already taken on this server');
                 return redirect('/applications');
                 return redirect('/applications');
             }
             }

+ 1 - 1
resources/views/aliases.blade.php

@@ -156,7 +156,7 @@ Aliases
 <script>
 <script>
     $.get("/applications/api", function(applications) {
     $.get("/applications/api", function(applications) {
         JSON.parse(JSON.stringify(applications)).forEach(application => {
         JSON.parse(JSON.stringify(applications)).forEach(application => {
-            $("#application-list").append("<option value='"+application["id"]+"'>"+application["domain"]+"</option>");
+            $("#application-list").append("<option value='"+application["id"]+"'>"+application["domain"]+" (user "+application["username"]+")</option>");
         });
         });
     });
     });
 </script>
 </script>

+ 1 - 1
resources/views/auth/login.blade.php

@@ -21,7 +21,7 @@ Login
                             <form method="POST" action="{{ route('login') }}" class="user ws-validate">
                             <form method="POST" action="{{ route('login') }}" class="user ws-validate">
                                 @csrf
                                 @csrf
                                 <div class="form-group">
                                 <div class="form-group">
-                                    <input type="email" name="email" class="form-control form-control-user" aria-describedby="emailHelp" placeholder="john.doe@domain.ltd" required autocomplete="email" autofocus>
+                                    <input type="email" name="email" class="form-control form-control-user" aria-describedby="emailHelp" placeholder="john.doe@domain.ltd" required autocomplete="off" autofocus>
                                 </div>
                                 </div>
                                 <div class="form-group">
                                 <div class="form-group">
                                     <input type="password" name="password" class="form-control form-control-user" placeholder="password" required autocomplete="current-password">
                                     <input type="password" name="password" class="form-control form-control-user" placeholder="password" required autocomplete="current-password">

+ 1 - 1
resources/views/auth/passwords/reset.blade.php

@@ -22,7 +22,7 @@ Reset Password
                                 @csrf
                                 @csrf
                                 <input type="hidden" name="token" value="{{ $token }}">
                                 <input type="hidden" name="token" value="{{ $token }}">
                                 <div class="form-group">
                                 <div class="form-group">
-                                    <input type="email" name="email" class="form-control form-control-user" aria-describedby="emailHelp" placeholder="john.doe@domain.ltd" value="{{ $email ?? old('email') }}" required autocomplete="email" autofocus>
+                                    <input type="email" name="email" class="form-control form-control-user" aria-describedby="emailHelp" placeholder="john.doe@domain.ltd" value="{{ $email ?? old('email') }}" required autocomplete="off" autofocus>
                                 </div>
                                 </div>
                                 <div class="form-group">
                                 <div class="form-group">
                                     <input class="form-control form-control-user" type="password" name="password" required autocomplete="new-password">
                                     <input class="form-control form-control-user" type="password" name="password" required autocomplete="new-password">