You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/02/16 17:40:23 UTC
[1/4] airavata-php-gateway git commit: fixing add
data-storage-preference issue
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop bac3b46ca -> 98760bc34
fixing add data-storage-preference issue
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/3c3d5658
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3c3d5658
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3c3d5658
Branch: refs/heads/develop
Commit: 3c3d5658c88aa2405288be0f672c5fd04461842a
Parents: ea10085
Author: scnakandala <su...@gmail.com>
Authored: Mon Feb 15 10:36:39 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Feb 15 10:36:39 2016 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3c3d5658/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 2c9d143..4a6000b 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -141,7 +141,7 @@
<div class="add-data-storage-preference-block hide">
<div class="well">
- <form action="{{URL::to('/')}}/gp/add-dsp" method="POST">
+ <form action="{{URL::to('/')}}/gp/add-srp" method="POST">
<input type="hidden" name="gatewayId" id="gatewayId" value="">
<div class="input-group">
[3/4] airavata-php-gateway git commit: Providing alternate routes to
normal users to access dashboard since AdminController is only accessible to
Admins.
Posted by nd...@apache.org.
Providing alternate routes to normal users to access dashboard since AdminController is only accessible to Admins.
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/690a2043
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/690a2043
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/690a2043
Branch: refs/heads/develop
Commit: 690a2043222d558cf47d85ad417566b5525d379a
Parents: bac3b46
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Feb 16 11:32:31 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Feb 16 11:32:31 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 5 ++++-
app/routes.php | 2 ++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/690a2043/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index b43bf29..d1592f4 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -230,7 +230,7 @@ class AccountController extends BaseController
return View::make('home');
}
- return Redirect::to("admin/dashboard");
+ return Redirect::to("account/dashboard");
}
public function forgotPassword()
@@ -425,4 +425,7 @@ class AccountController extends BaseController
return Redirect::to('home');
}
+ public function dashboard(){
+ return View::make("account/dashboard");
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/690a2043/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 2d0468e..4a6b6ee 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -22,6 +22,8 @@ Route::get("login", "AccountController@loginView");
Route::post("login", "AccountController@loginSubmit");
+Route::get("account/dashboard", "AccountController@dashboard");
+
//Route::get("callback-url", "AccountController@oauthCallback");
Route::get("logout", "AccountController@logout");
[4/4] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by nd...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
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/98760bc3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/98760bc3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/98760bc3
Branch: refs/heads/develop
Commit: 98760bc345b3accacd78882dcb7f1292a2abe39e
Parents: 690a204 69dcdd1
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Feb 16 11:37:44 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Feb 16 11:37:44 2016 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/master'
Posted by nd...@apache.org.
Merge remote-tracking branch 'origin/master'
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/69dcdd1a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/69dcdd1a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/69dcdd1a
Branch: refs/heads/develop
Commit: 69dcdd1a11ba3421e84e97a3a0896ab80de62898
Parents: 3c3d565 bac3b46
Author: scnakandala <su...@gmail.com>
Authored: Mon Feb 15 10:37:44 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Feb 15 10:37:44 2016 -0500
----------------------------------------------------------------------
app/controllers/ComputeResourceController.php | 2 +-
app/controllers/StorageResourceController.php | 19 +-
app/libraries/Airavata/API/Airavata.php | 2515 +++++++++++++-------
app/libraries/Airavata/Model/Types.php | 885 ++++++-
app/libraries/CRUtilities.php | 2 +-
app/libraries/SRUtilities.php | 21 +-
app/views/resource/edit.blade.php | 39 +-
app/views/storage-resource/browse.blade.php | 2 +-
8 files changed, 2500 insertions(+), 985 deletions(-)
----------------------------------------------------------------------