Fixed some UI stuff and made movie add to Master if not yet in it

project/controllers/library.py

@@ -95,6 +95,9 @@ def addlibraryItem(name,user=None):
 	from project.model.Movie import Movie
 	movie = Movie.objects(tmdb_id=movie_id).first()
 	if movie:
+		if library.name != 'Master':
+			master = Library.objects(user=user,name="Master",unit='Movie').first()
+			master.addUnit(movie)
 		library.addUnit(movie)
 		return jsonify(response='success',type='redirect',path=url_for(endpoint='library',name=name,_external=True))
 
@@ -106,5 +109,8 @@ def addlibraryItem(name,user=None):
 	from project.model.Movie import Movie
 	movie = Movie.convertMovie(movie)	
 	library.addUnit(movie)
+	if library.name != 'Master':
+			master = Library(user=user,name="Master",unit='Movie').first()
+			master.addUnit(movie)
 
 	return jsonify(response='success',type='redirect',path=url_for(endpoint='library',name=name,_external=True))
\ No newline at end of file

project/templates/library/master.html

@@ -29,7 +29,9 @@
                         {{ library.collection|length }}
                     </td>
                     <td>
+                        {% if library.name != 'Master' and library.name != 'Borrowed' %}
                         <button type="button" class="btn btn-default btn-small remove-library" data-name='{{ library.name }}'>Delete</button>
+                        {% endif %}
                     </td>
                 </tr>
             {% endfor %}

project/templates/modal_base.html

@@ -68,8 +68,10 @@
                     }
                 });
             });
-            $("#{{ self.form_id() }} input").keyup(function(event){
+            $("#{{ self.form_id() }} input").keydown(function(event){
                 if(event.keyCode == 13){
+                    event.preventDefault();
+                    event.stopPropagation();
                     $acceptButton.click();
                 }
             });