Merge pull request #25 from ComputerScienceHouse/develop

Fixes

Author: mbillow

frontend/javascript/modules/editUser.js

@@ -178,7 +178,6 @@ export default class EditUser {
 
     // Freshman Name
     modal.querySelector('input[name=name]').value = this.data.name;
-    modal.querySelector('input[name=name]').disabled = true;
 
     // Room Number
     modal.querySelector('input[name=room]').value = this.data.room_number;

frontend/javascript/modules/table.js

@@ -7,30 +7,28 @@ export default class Table {
     this.table = table;
 
     // Set options based on data attributes
-    this.paginated = !(this.table.dataset.paginated === 'false');
     this.sortColumn = (_.isNil(this.table.dataset.sortColumn) ||
                         _.isNaN(this.table.dataset.sortColumn)) ?
                         1 : this.table.dataset.sortColumn;
     this.sortOrder = this.table.dataset.sortOrder === "asc" ? "asc" : "desc";
-    this.lengthChangable = this.table.dataset.lengthChangable === 'true';
+
+    this.options = {
+      lengthChange: this.table.dataset.lengthChangable === 'true',
+      info: false,
+      paging: !(this.table.dataset.paginated === 'false'),
+      pagingType: "numbers"
+    };
 
     // Just remove the search input from the DOM instead of disabling it
-    this.domOptions = "lrtip";
-    if (this.table.dataset.searchable === 'true') {
-      this.domOptions = "lfrtip";
+    if (this.table.dataset.searchable !== 'true') {
+      this.options.dom = "lrtip";
     }
 
     this.render();
   }
 
   render() {
-    this.table = $(this.table).DataTable({ // eslint-disable-line new-cap
-      // dom: this.domOptions,
-      lengthChange: this.lengthChangable,
-      info: false,
-      paging: this.paginated,
-      pagingType: "numbers"
-    })
+    this.table = $(this.table).DataTable(this.options) // eslint-disable-line new-cap
       .order([this.sortColumn, this.sortOrder])
       .draw();
   }