You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/01/07 18:38:05 UTC
[1/4] airavata-php-gateway git commit: differentiating the scigap
portal through a configuration
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master b73806af7 -> 55cbd9e79
differentiating the scigap portal through a configuration
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/062aef9c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/062aef9c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/062aef9c
Branch: refs/heads/master
Commit: 062aef9c425997a6b5259e80e3452647ce7f9074
Parents: 33bd2a7
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:24:40 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:24:40 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 4 ++++
app/controllers/AccountController.php | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/062aef9c/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 041004d..344813b 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -170,6 +170,10 @@ return array(
* *****************************************************************
*/
'portal' => [
+ /**
+ * Whether this portal is the SciGaP admin portal
+ */
+ 'scigap-admin-portal' => false,
/**
* Set the name of theme in use here
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/062aef9c/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 3f1bd6b..e1975cd 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -144,7 +144,7 @@ class AccountController extends BaseController
}
//only for super admin
- if( Config::get('pga_config.wsis')['tenant-domain'] == ""){
+ if( Config::get('pga_config.portal')['scigap-admin-portal'] == true){
Session::put("scigap_admin", true);
}
[4/4] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sc...@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/55cbd9e7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/55cbd9e7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/55cbd9e7
Branch: refs/heads/master
Commit: 55cbd9e79b254340c0115c7c148398ff83113cb6
Parents: 81bab7a b73806a
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:37:18 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:37:18 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/55cbd9e7/app/config/pga_config.php.template
----------------------------------------------------------------------
[2/4] airavata-php-gateway git commit: storage resource registering
should be enabled only to the scigap admin
Posted by sc...@apache.org.
storage resource registering should be enabled only to the scigap admin
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/6c46b9f3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6c46b9f3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6c46b9f3
Branch: refs/heads/master
Commit: 6c46b9f36acb4b797ac76cf12d814cebe7f9dfce
Parents: 062aef9
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:26:23 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:26:23 2016 -0500
----------------------------------------------------------------------
app/views/partials/dashboard-block.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6c46b9f3/app/views/partials/dashboard-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php
index 5b8c818..cf0205f 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -39,7 +39,7 @@
<li>
<a><span class="glyphicon glyphicon-folder-open"></span> Storage Resources</a>
<ul>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<li
@if( Session::has("admin-nav") && Session::get("admin-nav") == "sr-create") class="active" @endif>
<a class="dashboard-link" href="{{ URL::to('/')}}/sr/create"><i class="fa fa-fw fa-table"></i>Register</a>
[3/4] airavata-php-gateway git commit: view cr should show form
disabled fields
Posted by sc...@apache.org.
view cr should show form disabled fields
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/81bab7a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/81bab7a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/81bab7a7
Branch: refs/heads/master
Commit: 81bab7a7fcc28ecf47ade823c764421d02316253
Parents: 6c46b9f
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:34:17 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:34:17 2016 -0500
----------------------------------------------------------------------
app/views/resource/browse.blade.php | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bab7a7/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index 1ee5491..6b3ffa1 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -51,11 +51,13 @@
<th>Id</th>
@if(Session::has("admin"))
<th>Enabled</th>
- <!--<th>Edit</th>-->
+ @if(Session::has("scigap_admin"))
+ <th>Edit</th>
+ @endif
@endif
<th>View</th>
- @if(Session::has("admin"))
- <!--<th>Delete</th>-->
+ @if(Session::has("scigap_admin"))
+ <th>Delete</th>
@endif
</tr>
@@ -80,20 +82,19 @@
</div>
@endif
</td>
- <!--
<td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</td>
- -->
@endif
+ @if(Session::has("scigap_admin"))
<td>
- <a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
+ <a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="View">
<span class="glyphicon glyphicon-list"></span>
</a>
</td>
- @if(Session::has("admin"))
- <!--
+ @endif
+ @if(Session::has("scigap_admin"))
<td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-cr" data-toggle="modal"
@@ -102,7 +103,6 @@
data-crid="{{$crId}}"></span>
</a>
</td>
- -->
@endif
</tr>
@endforeach