4 files changed, 18 insertions, 12 deletions

diff --git a/client/src/app/shared/forms/form-validators/video.ts b/client/src/app/shared/forms/form-validators/video.ts
index 434773501..65f11f5da 100644
--- a/client/src/app/shared/forms/form-validators/video.ts
+++ b/client/src/app/shared/forms/form-validators/video.ts
@@ -9,6 +9,13 @@ export const VIDEO_NAME = {
   }
 }
 
+export const VIDEO_PRIVACY = {
+  VALIDATORS: [ Validators.required ],
+  MESSAGES: {
+    'required': 'Video privacy is required.'
+  }
+}
+
 export const VIDEO_CATEGORY = {
   VALIDATORS: [ Validators.required ],
   MESSAGES: {
diff --git a/client/src/app/shared/search/search-field.type.ts b/client/src/app/shared/search/search-field.type.ts
index 63557898a..ff0bb8de1 100644
--- a/client/src/app/shared/search/search-field.type.ts
+++ b/client/src/app/shared/search/search-field.type.ts
@@ -1 +1 @@
-export type SearchField = 'name' | 'author' | 'host' | 'magnetUri' | 'tags'
+export type SearchField = 'name' | 'author' | 'host' | 'tags'
diff --git a/client/src/app/shared/search/search.component.html b/client/src/app/shared/search/search.component.html
index c6c6ff6a8..0302447d0 100644
--- a/client/src/app/shared/search/search.component.html
+++ b/client/src/app/shared/search/search.component.html
@@ -6,12 +6,12 @@
 
   <input
     type="text" id="search-video" name="search-video" class="form-control" placeholder="Search" class="form-control"
-    [(ngModel)]="searchCriterias.value" (keyup.enter)="doSearch()"
+    [(ngModel)]="searchCriteria.value" (keyup.enter)="doSearch()"
   >
 
   <div class="input-group-btn" dropdown placement="bottom right">
     <button id="simple-btn-keyboard-nav" type="button" class="btn btn-default" dropdownToggle>
-      {{ getStringChoice(searchCriterias.field) }} <span class="caret"></span>
+      {{ getStringChoice(searchCriteria.field) }} <span class="caret"></span>
     </button>
     <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="simple-btn-keyboard-nav" *dropdownMenu>
       <li *ngFor="let choice of choiceKeys" class="dropdown-item" role="menu-item">
diff --git a/client/src/app/shared/search/search.component.ts b/client/src/app/shared/search/search.component.ts
index ecce20666..6e2827fe3 100644
--- a/client/src/app/shared/search/search.component.ts
+++ b/client/src/app/shared/search/search.component.ts
@@ -16,10 +16,9 @@ export class SearchComponent implements OnInit {
     name: 'Name',
     author: 'Author',
     host: 'Pod Host',
-    magnetUri: 'Magnet URI',
     tags: 'Tags'
   }
-  searchCriterias: Search = {
+  searchCriteria: Search = {
     field: 'name',
     value: ''
   }
@@ -30,13 +29,13 @@ export class SearchComponent implements OnInit {
     // Subscribe if the search changed
     // Usually changed by videos list component
     this.searchService.updateSearch.subscribe(
-      newSearchCriterias => {
+      newSearchCriteria => {
         // Put a field by default
-        if (!newSearchCriterias.field) {
-          newSearchCriterias.field = 'name'
+        if (!newSearchCriteria.field) {
+          newSearchCriteria.field = 'name'
         }
 
-        this.searchCriterias = newSearchCriterias
+        this.searchCriteria = newSearchCriteria
       }
     )
   }
@@ -49,9 +48,9 @@ export class SearchComponent implements OnInit {
     $event.preventDefault()
     $event.stopPropagation()
 
-    this.searchCriterias.field = choice
+    this.searchCriteria.field = choice
 
-    if (this.searchCriterias.value) {
+    if (this.searchCriteria.value) {
       this.doSearch()
     }
   }
@@ -61,7 +60,7 @@ export class SearchComponent implements OnInit {
       this.router.navigate([ '/videos/list' ])
     }
 
-    this.searchService.searchUpdated.next(this.searchCriterias)
+    this.searchService.searchUpdated.next(this.searchCriteria)
   }
 
   getStringChoice (choiceKey: SearchField) {