Fix merge conflict

Author: bodom0015

app/controllers/Extractors.scala

@@ -63,7 +63,8 @@ class Extractors  @Inject() (extractions: ExtractionService,
     }
     val selectedExtractors: List[String] = extractorService.getEnabledExtractors()
     val groups = extractions.groupByType(extractions.findAll())
-    Ok(views.html.updateExtractors(runningExtractors, selectedExtractors, groups))
+    val labels = extractorService.listExtractorsLabels()
+    Ok(views.html.updateExtractors(runningExtractors, selectedExtractors, groups, labels))
   }
 
   def manageLabels = ServerAdminAction { implicit request =>
@@ -116,7 +117,10 @@ class Extractors  @Inject() (extractions: ExtractionService,
     implicit val user = request.user
     val targetExtractor = extractorService.listExtractorsInfo(List.empty).find(p => p.name == extractorName)
     targetExtractor match {
-      case Some(extractor) => Ok(views.html.extractorDetails(extractor))
+      case Some(extractor) => {
+        val labels = extractorService.getLabelsForExtractor(extractor.name)
+        Ok(views.html.extractorDetails(extractor, labels))
+      }
       case None => InternalServerError("Extractor not found: " + extractorName)
     }
   }

app/services/ExtractorService.scala

@@ -48,4 +48,6 @@ trait ExtractorService {
   def createExtractorsLabel(name: String, category: Option[String], extractors: List[String]): Option[ExtractorsLabel]
 
   def updateExtractorsLabel(label: ExtractorsLabel): Option[ExtractorsLabel]
+
+  def getLabelsForExtractor(extractorName: String): List[ExtractorsLabel]
 }

app/services/mongodb/MongoDBExtractorService.scala

@@ -13,6 +13,9 @@ import play.api.libs.json.{JsArray, JsNumber, JsObject, JsString, JsValue, Json}
 import services._
 import services.mongodb.MongoContext.context
 
+import scala.collection.mutable
+import scala.collection.mutable.ListBuffer
+
 @Singleton
 class MongoDBExtractorService extends ExtractorService {
 
@@ -229,6 +232,10 @@ class MongoDBExtractorService extends ExtractorService {
     ExtractorsLabelDAO.save(updated, WriteConcern.Safe)
     Some(updated)
   }
+
+  def getLabelsForExtractor(extractorName: String): List[ExtractorsLabel] = {
+    ExtractorsLabelDAO.findAll().filter(_.extractors.contains(extractorName)).toList
+  }
 }
 
 object ExtractorServer extends ModelCompanion[ExtractorServer, ObjectId] {

app/views/extractorDetails.scala.html

@@ -1,4 +1,4 @@
-@(extractor: ExtractorInfo)(implicit user: Option[models.User])
+@(extractor: ExtractorInfo, labels: List[ExtractorsLabel])(implicit user: Option[models.User])
 @import api.Permission
 
 @main("Extractor Details") {
@@ -165,6 +165,26 @@
                     }
                     </div>
                 }
+
+                @if(!labels.isEmpty) {
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <fieldset>
+                                <legend>Labels</legend>
+                                @if(Permission.checkServerAdmin(user)) {
+                                    <a href="@routes.Extractors.manageLabels" style="margin-top:-3.0em;" class="btn btn-default btn-xs pull-right">
+                                        <span class="glyphicon glyphicon-wrench"></span> Manage
+                                    </a>
+                                }
+                                <ul>
+                                @for(label <- labels) {
+                                    <li>@label.name</li>
+                                }
+                                </ul>
+                            </fieldset>
+                        </div>
+                    </div>
+                }
             </form>
         </div>
 

app/views/updateExtractors.scala.html

@@ -1,5 +1,5 @@
-@(runningExtractors: List[ExtractorInfo], selectedExtractors: List[String], groups: Map[String, ExtractionGroup],
-        showOptional: Map[String,Boolean] = Map("additionalInfo"->false, "processTriggers"->false, "labelSection"->false, "filterSection"->false, "ratings"->false))(implicit user: Option[models.User])
+@(runningExtractors: List[ExtractorInfo], selectedExtractors: List[String], groups: Map[String, ExtractionGroup], labels: List[ExtractorsLabel],
+        showOptional: Map[String,Boolean] = Map("additionalInfo"->false, "processTriggers"->false, "labelSection"->false, "filterSection"->true, "ratings"->false))(implicit user: Option[models.User])
 @import _root_.util.Formatters._
 @import helper._
 @import api.Permission
@@ -42,15 +42,11 @@ <h1>Extractor Catalog</h1>
                     <div class="btn-group" data-toggle="buttons">
 
                         <!-- Disguised checkboxes as buttons -->
-                        <label class="btn btn-primary active">
-                            <input type="checkbox" autocomplete="off" checked> Image
-                        </label>
-                        <label class="btn btn-primary active">
-                            <input type="checkbox" autocomplete="off" checked> Video
-                        </label>
-                        <label class="btn btn-primary active">
-                            <input type="checkbox" autocomplete="off" checked> Audio
-                        </label>
+                        @for(label <- labels) {
+                            <label class="btn btn-primary active">
+                                <input type="checkbox" autocomplete="off" checked> @label.name
+                            </label>
+                        }
                     </div>
                 </div>
             </fieldset>
@@ -355,4 +351,4 @@ <h1>Extractor Catalog</h1>
                 });
         </script>
     }
-}
+}