Updating to move from borrowed to loaned

project/controllers/library.py

@@ -30,7 +30,7 @@ def removeLibrary(user = None):
 	library = Library.objects(user=user,unit='Movie',name=name).first()
 	if not library:
 		return jsonify(response='error',message='Library requested does not exists'),404
-	if library.name == 'Master' or library.name == 'Borrowed':
+	if library.name == 'Master' or library.name == 'Loaned':
 		return jsonify(response='error',message='Library %s cannot be deleted' % library.name),404
 	library.delete()
 	return jsonify(response='success',type='redirect',path=url_for(endpoint='libraries',_external=True))	

project/controllers/loan.py

@@ -74,7 +74,7 @@ def createLoan(user=None):
 
 	loan = Loan.create(user,movie,borrower,return_date)
 	from project.model.Library import Library
-	borrowed_lib = Library.objects(user=user,unit="Movie",name="Borrowed").first()
+	borrowed_lib = Library.objects(user=user,unit="Movie",name="Loaned").first()
 	borrowed_lib.addUnit(movie)
 
 	return jsonify(response='success',type="reload")
@@ -97,7 +97,7 @@ def returnMovie(user=None):
 		return jsonify(response='error',message='This movie has not been loaned out and cannot be returned'),404	
 
 	from project.model.Library import Library
-	borrowed_lib = Library.objects(user=user,unit="Movie",name="Borrowed").first()
+	borrowed_lib = Library.objects(user=user,unit="Movie",name="Loaned").first()
 	borrowed_lib.removeUnit(movie)
 	loan.delete()
 

project/templates/library/library.html

@@ -39,7 +39,7 @@
                                 <button type="button" class="btn btn-default btn-small return-movie" data-toggle="modal" data-target="#return-form" data-id='{{ movie.id }}'>Return</button>
                                 <button type="button" class="btn btn-default btn-small reminder" data-toggle="modal" data-target="#reminder-form" data-id='{{ movie.id }}'>Reminder</button>
                               {% endif %}
-                              {% if (library.name != "Master" and library.name != "Borrowed") or loan == None %}
+                              {% if (library.name != "Master" and library.name != "Loaned") or loan == None %}
                                 <button type="button" class="btn btn-default btn-small remove-movie" data-id='{{ loop.index }}'>Remove</button>
                               {% endif %}
                             </div>
@@ -70,7 +70,7 @@
                                 <button type="button" class="btn btn-default btn-small return-movie" data-toggle="modal" data-target="#return-form" data-id='{{ movie.id }}'>Return</button>
                                  <button type="button" class="btn btn-default btn-small reminder" data-toggle="modal" data-target="#reminder-form" data-id='{{ movie.id }}'>Reminder</button>
                               {% endif %}
-                              {% if (library.name != "Master" and library.name != "Borrowed") or loan == None %}
+                              {% if (library.name != "Master" and library.name != "Loaned") or loan == None %}
                                 <button type="button" class="btn btn-default btn-small remove-movie" data-id='{{ loop.index }}'>Remove</button>
                               {% endif %}
                               

project/templates/library/master.html

@@ -18,7 +18,7 @@
                 </tr>
             </thead>
             <tbody>
-            {% for library in libraries if not library.name == 'Borrowed' %}
+            {% for library in libraries if not library.name == 'Loaned' %}
                 <tr class='clickable' data-name='{{ library.name }}'>
                     <td>
                         <a href="#">{{ library.name }}</a>
@@ -27,7 +27,7 @@
                         {{ library.collection|length }}
                     </td>
                     <td>
-                        {% if library.name != 'Master' and library.name != 'Borrowed' %}
+                        {% if library.name != 'Master' and library.name != 'Loaned' %}
                         <button type="button" class="btn btn-default btn-small remove-library" data-name='{{ library.name }}'>Delete</button>
                         {% endif %}
                     </td>
@@ -66,7 +66,7 @@
                 event.preventDefault();
                 var library_name = $(this).data('name');
                 var message = "Are you sure you want to delete this Library?";
-                if(library_name == "Master" || library_name == "Borrowed"){
+                if(library_name == "Master" || library_name == "Loaned"){
                     alert("You cannot delete the "+library_name+" library.");
                     return false;
                 }

project/templates/loan/master.html

@@ -7,7 +7,7 @@
                 <tr>
                     <td>Movie</td>
                     <td>Borrower</td>
-                    <td>Date Borrowed</td>
+                    <td>Date Loaned</td>
                     <td>Due Date</td>
                     <td>Options</td>
                 </tr>