Merge branch 'dev'

iit-ideashop · Mar 11, 2015 · 1b27b9d · 1b27b9d
2 parents 44d9d20 + e98078a
commit 1b27b9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/AdminBudgetController.php b/app/controllers/AdminBudgetController.php
@@ -57,7 +57,7 @@ public function approve(){
         //must provide request id, comments and budget approval
         //Post data
         $comment = Input::get('requestComment');
-        $amount = floatval(Input::get('budgetAmount'));
+        $amount = floatval(str_replace(",","",Input::get('budgetAmount')));
         $budgetID = Input::get('requestID');
         //Pull the budget request
         $request = BudgetRequest::find($budgetID);

diff --git a/app/views/admin/projects/overview.blade.php b/app/views/admin/projects/overview.blade.php
@@ -12,7 +12,8 @@
     Actions <span class="caret"></span>
   </button>
   <ul class="dropdown-menu" role="menu">
-    <li><a href="#">Create Budget</a></li>
+    <!-- <li><a href="#">Create Budget</a></li> -->
+      <li><a href="{{URL::route("project.dashboard",$project->id)}}">Project Dashboard</a></li>
     <li><a href="{{URL::route("admin.orders",array('ipro'=>$project->id, 'status'=>'', 'semester'=>'', 'filters'=>'1'))}}">View Orders</a></li>
     <li><a href="{{URL::route("admin.accounts.editor",$project->id)}}">Account Editor</a></li>
       <li><a href="{{URL::route("project.groupmanager",$project->id)}}">Group Manager</a></li>