airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject [2/2] airavata-php-gateway git commit: Committing Hackathon code for Allocation Request.
Date Tue, 23 Feb 2016 18:53:42 GMT
Committing Hackathon code for Allocation Request.


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/c047e65f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c047e65f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c047e65f

Branch: refs/heads/master
Commit: c047e65f5a9873ba6f50f3ad9e35facb8771ec0a
Parents: 5cbf2ec
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Tue Feb 23 13:53:02 2016 -0500
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Tue Feb 23 13:53:02 2016 -0500

----------------------------------------------------------------------
 app/controllers/AccountController.php |  8 ++++++++
 app/controllers/AdminController.php   |  4 ++++
 app/views/account/dashboard.blade.php | 10 ++++++++++
 3 files changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c047e65f/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 2b16190..48ccf9e 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -432,4 +432,12 @@ class AccountController extends BaseController
         return Redirect::to('home');
     }
 
+    public function allocationRequestView(){
+        return View::make("account/request-allocation");
+    }
+
+    public function allocationRequestSubmit(){
+        return 'result';
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c047e65f/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 0123ee5..a014a88 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -302,4 +302,8 @@ class AdminController extends BaseController {
         $storageResource->enabled = false;
         SRUtilities::register_or_update_storage_resource($storageResource, true);
     }
+
+    public function viewAllocationRequests(){
+    	return 'result';
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c047e65f/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index 9fc4b7a..0e1b3c6 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -216,6 +216,16 @@
         </div>
     </div>
     @endif
+
+    <!--
+    Hidden until completed.
+    <div class="col-md-12 text-center">
+        <a href="{{URL::to('/')}}/allocation-request">
+            <button class="btn btn-default ">Request an allocation</button>
+        </a>
+    </div>
+    -->
+
 </div>
 
 @stop
\ No newline at end of file


Mime
View raw message