Forráskód Böngészése

Fixed multiple confirmations per bounding box

Fixed confirmation by multiple users. Usernames are now left-aligned in the confirmations list.
blunk 3 éve
szülő
commit
6ef9be034c

+ 6 - 3
pycs/database/Result.py

@@ -161,13 +161,16 @@ class Result(BaseModel):
         if self.origin == "pipeline":
             self.set_origin(origin="user", origin_user=user)
 
-        # Get current confirmations.
-        confirmations = self.confirmations
+        # Get current confirmations by given user.
+        confirmations_by_user = ResultConfirmation.query.filter(
+                                    ResultConfirmation.result_id == self.id,
+                                    ResultConfirmation.confirming_user == user)
+        _confirmations_by_user = [c.serialize() for c in confirmations_by_user.all()]
 
         # Results can only be confirmed if the result is labeled.
         # Also, the original annotator cannot confirm the result and we want
         # to avoid duplicates.
-        if self.label_id is not None and self.origin_user != user and not len(confirmations) > 0:
+        if self.label_id is not None and self.origin_user != user and not len(_confirmations_by_user) > 0:
             ResultConfirmation.new(commit=False,
                                    result_id=self.id,
                                    confirming_user=user)

+ 1 - 1
webui/src/components/media/cropped-image.vue

@@ -32,7 +32,7 @@
           </tr>
           <tr v-if="box.confirmations.length !== 0">
             <td>Confirmed by:</td>
-            <td>
+            <td align="left">
               <ul class="confirming-users">
                 <li v-for="confirmation in box.confirmations" :key="confirmation.id" margin="0" padding="0">
                   <b>{{confirmation.confirming_user}}</b>