Ver Fonte

Merge pull request #4067 from idanoo/dev

Update User artisan commands to match UserDelete
daniel há 2 anos atrás
pai
commit
0269e4d0e8

+ 5 - 1
app/Console/Commands/UserAdmin.php

@@ -39,7 +39,11 @@ class UserAdmin extends Command
     public function handle()
     public function handle()
     {
     {
         $id = $this->argument('id');
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             $this->error('Could not find any user with that username or id.');
             exit;
             exit;

+ 5 - 1
app/Console/Commands/UserShow.php

@@ -39,7 +39,11 @@ class UserShow extends Command
     public function handle()
     public function handle()
     {
     {
         $id = $this->argument('id');
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             $this->error('Could not find any user with that username or id.');
             exit;
             exit;

+ 5 - 1
app/Console/Commands/UserSuspend.php

@@ -39,7 +39,11 @@ class UserSuspend extends Command
     public function handle()
     public function handle()
     {
     {
         $id = $this->argument('id');
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             $this->error('Could not find any user with that username or id.');
             exit;
             exit;

+ 5 - 1
app/Console/Commands/UserUnsuspend.php

@@ -39,7 +39,11 @@ class UserUnsuspend extends Command
     public function handle()
     public function handle()
     {
     {
         $id = $this->argument('id');
         $id = $this->argument('id');
-        $user = User::whereUsername($id)->orWhere('id', $id)->first();
+        if(ctype_digit($id) == true) {
+            $user = User::find($id);
+        } else {
+            $user = User::whereUsername($id)->first();
+        }
         if(!$user) {
         if(!$user) {
             $this->error('Could not find any user with that username or id.');
             $this->error('Could not find any user with that username or id.');
             exit;
             exit;