From babbe47f34a3e399ebba5077eb126fd005c85f31 Mon Sep 17 00:00:00 2001
From: Yaman <ybq987@gmail.com>
Date: Mon, 12 Jan 2015 21:34:41 -0500
Subject: [PATCH] fixed router bug, and cleaned up code

---
 chromebook-checkout-meteor/client/checkout.js | 19 ---------------
 chromebook-checkout-meteor/client/router.js   | 12 +++++-----
 chromebook-checkout-meteor/client/teacher.js  | 23 -------------------
 3 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/chromebook-checkout-meteor/client/checkout.js b/chromebook-checkout-meteor/client/checkout.js
index 54d9dda..c86b381 100644
--- a/chromebook-checkout-meteor/client/checkout.js
+++ b/chromebook-checkout-meteor/client/checkout.js
@@ -6,25 +6,6 @@ Template.checkout.helpers({
 
 
 Template.checkout.events({
-  'click .cross' : function() {
-    if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
-      if (this.status === 0) {
-        Chromebooks.update(this._id, {$set: {status: 2}});
-        Chromebooks.update(this._id, {$set: {user: null}});
-      }
-      else if (this.status ===1) {
-        Chromebooks.update(this._id, {$set: {status: 2}});
-      }
-      else {
-        Chromebooks.update(this._id, {$set: {status: 0}});
-        Chromebooks.update(this._id, {$set: {last_checkout: null}});
-        Chromebooks.update(this._id, {$set: {userid: null}});
-      }
-    }
-    else {
-      alert("Access Denied");
-    }
-  },
   'click .edit': function() {
     if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
       Router.go('/admin');
diff --git a/chromebook-checkout-meteor/client/router.js b/chromebook-checkout-meteor/client/router.js
index 9411324..f91a8b5 100644
--- a/chromebook-checkout-meteor/client/router.js
+++ b/chromebook-checkout-meteor/client/router.js
@@ -19,17 +19,17 @@ Router.route('/login', function() {
 });
 
 Router.route('/admin', function() {
-//  if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
+  if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
     this.render("admin");
-/*  } else {
+  } else {
     this.redirect('/login');
-  }*/
+  }
 });
 
 Router.route('/teacher', function() {
-//  if (Roles.userIsInRole(Meteor.userId(), ['admin', 'teacher'])) {
+  if (Roles.userIsInRole(Meteor.userId(), ['admin', 'teacher'])) {
     this.render("teacher");
-/*  } else {
+  } else {
        this.redirect('/login');
-    }*/
+    }
 });
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/teacher.js b/chromebook-checkout-meteor/client/teacher.js
index a82fd04..7b53d5a 100644
--- a/chromebook-checkout-meteor/client/teacher.js
+++ b/chromebook-checkout-meteor/client/teacher.js
@@ -22,26 +22,3 @@ Template.teacher.helpers({
     return carts.find();
   }
 });
-
-
-Template.teacher.events({
-  'click .cross' : function() {
-    if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
-      if (this.status === 0) {
-        Chromebooks.update(this._id, {$set: {status: 2}});
-        Chromebooks.update(this._id, {$set: {user: null}});
-      }
-      else if (this.status ===1) {
-        Chromebooks.update(this._id, {$set: {status: 2}});
-      }
-      else {
-        Chromebooks.update(this._id, {$set: {status: 0}});
-        Chromebooks.update(this._id, {$set: {last_checkout: null}});
-        Chromebooks.update(this._id, {$set: {userid: null}});
-      }
-    }
-    else {
-      alert("Access Denied");
-    }
-  }
-});
\ No newline at end of file