airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject [1/3] airavata-php-gateway git commit: AIRAVATA-1871 fix
Date Fri, 16 Sep 2016 05:51:47 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 256590269 -> 8e0f47a8b


AIRAVATA-1871 fix


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/daa20fb0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/daa20fb0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/daa20fb0

Branch: refs/heads/develop
Commit: daa20fb01f46286556b1fe05a4d832ef03672305
Parents: 5e6bca4
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Thu Sep 15 22:48:16 2016 -0700
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Thu Sep 15 22:48:16 2016 -0700

----------------------------------------------------------------------
 app/views/admin/manage-roles.blade.php | 30 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/daa20fb0/app/views/admin/manage-roles.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-roles.blade.php b/app/views/admin/manage-roles.blade.php
index 1b54d21..4174eb1 100644
--- a/app/views/admin/manage-roles.blade.php
+++ b/app/views/admin/manage-roles.blade.php
@@ -37,21 +37,23 @@
                         @endif
                     </tr>
                     @foreach( $roles as $role)
-                    <tr>
-                        <td class="role-name">{{ $role }}</td>
-                        @if(Session::has("admin"))
-                        <td>
-                            <!-- 
-                            // unable to find functions to edit a role name so commenting
for now
-                            <span class="glyphicon glyphicon-pencil edit-role-name"></span>&nbsp;&nbsp;
-                            -->
-                            <a href="{{URL::to('/')}}/admin/dashboard/users?role={{$role}}">
-                                <span class="glyphicon glyphicon-user role-users"></span>&nbsp;&nbsp;
-                            </a>
-                            <span class="glyphicon glyphicon-trash delete-role"></span>&nbsp;&nbsp;
-                        </td>
+                        @if((strpos($role, 'Internal') === false) && (strpos($role,
'Application') === false) )
+                        <tr>
+                            <td class="role-name">{{ $role }}</td>
+                            @if(Session::has("admin"))
+                            <td>
+                                <!-- 
+                                // unable to find functions to edit a role name so commenting
for now
+                                <span class="glyphicon glyphicon-pencil edit-role-name"></span>&nbsp;&nbsp;
+                                -->
+                                <a href="{{URL::to('/')}}/admin/dashboard/users?role={{$role}}">
+                                    <span class="glyphicon glyphicon-user role-users"></span>&nbsp;&nbsp;
+                                </a>
+                                <span class="glyphicon glyphicon-trash delete-role"></span>&nbsp;&nbsp;
+                            </td>
+                            @endif
+                        </tr>
                         @endif
-                    </tr>
                     @endforeach
                 </table>
                 @if(Session::has("admin"))


Mime
View raw message