Fixed #6301: Do not allow duplicate asset tags (#6324)

* Fixed #6301: Do not allow duplicate asset tags * Display error message for single asset_tag failure
snipe · Oct 12, 2018 · 704209d · 704209d
1 parent b8f8d49
commit 704209d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
@@ -171,8 +171,8 @@ public function store(ImageUploadRequest $request)
                 }
             }
 
-            // Was the asset created?
-            if ($asset->save()) {
+            // Validate the asset before saving
+            if ($asset->isValid() && $asset->save()) {
 
                 if (request('assigned_user')) {
                     $target = User::find(request('assigned_user'));

diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
@@ -35,6 +35,7 @@
           </div>
       @endif
       {!! $errors->first('asset_tags', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+      {!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
   </div>
     @include ('partials.forms.edit.serial', ['fieldname'=> 'serials[1]', 'translated_serial' => trans('admin/hardware/form.serial')])
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ @@
               </div>
           @endif
           {!! $errors->first('asset_tags', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+          {!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
       </div>
         @include ('partials.forms.edit.serial', ['fieldname'=> 'serials[1]', 'translated_serial' => trans('admin/hardware/form.serial')])
@@ Expand Down @@