airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [2/2] airavata-php-gateway git commit: Merge branch 'develop' of https://github.com/apache/airavata-php-gateway into simstream
Date Thu, 18 Aug 2016 20:49:36 GMT
Merge branch 'develop' of https://github.com/apache/airavata-php-gateway into simstream


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

Branch: refs/heads/develop
Commit: 16184725c97e104cf97f47b70ccffe7fb9af74e2
Parents: 51ea653 c1043b2
Author: Jeff Kinnison <jeffdkinnison@gmail.com>
Authored: Thu Aug 18 16:42:27 2016 -0400
Committer: Jeff Kinnison <jeffdkinnison@gmail.com>
Committed: Thu Aug 18 16:42:27 2016 -0400

----------------------------------------------------------------------
 app/controllers/AdminController.php             |  20 ++-
 app/controllers/ExperimentController.php        | 166 +++++++++++++------
 app/controllers/ProjectController.php           |  83 ++++++++--
 app/libraries/AdminUtilities.php                |  67 ++++----
 .../Airavata/Model/Messaging/Event/Types.php    | 124 ++++++++++++--
 .../Airavata/Model/Workspace/Types.php          |  25 +++
 app/libraries/ExperimentUtilities.php           |  32 ++--
 app/libraries/ProjectUtilities.php              |  23 ++-
 app/libraries/SharingUtilities.php              |  28 +++-
 .../Wsis/Stubs/AuthenticationAdminStub.php      |   3 +
 app/routes.php                                  |   8 +
 app/views/account/dashboard.blade.php           |   4 +-
 app/views/admin/manage-experiments.blade.php    |   9 +-
 app/views/admin/manage-gateway.blade.php        |  27 ++-
 app/views/application/module.blade.php          |   4 +-
 app/views/experiment/create-complete.blade.php  |   2 +
 app/views/experiment/edit.blade.php             |   2 +
 .../partials/experiment-container.blade.php     |  16 +-
 app/views/partials/experiment-info.blade.php    |  24 +++
 app/views/partials/sharing-form-modal.blade.php |   2 +-
 app/views/project/browse.blade.php              |   4 +-
 app/views/project/edit.blade.php                |   3 +
 app/views/project/summary.blade.php             |  12 +-
 public/js/sharing/share.js                      |  77 ++++++---
 public/js/sharing/sharing_utils.js              |   8 +-
 25 files changed, 576 insertions(+), 197 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/16184725/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --cc app/views/partials/experiment-info.blade.php
index 0e2a422,b418787..88e127d
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@@ -192,13 -204,13 +204,17 @@@
      </table>
  
      <div class="form-group">
+     @if($can_write === true)
+     @include('partials/sharing-display-body', array("form" => true))
+     @else
      @include('partials/sharing-display-body', array("form" => false))
+     @endif
      </div>
  
 +    @if(strcmp($expVal["applicationInterface"]->applicationName, "OpenMM_Stampede") ===
0)
 +    @include('partials/streaming-data')
 +    @endif
 +
      @if( !isset( $dashboard))
      <form action="{{URL::to('/') }}/experiment/summary" method="post" role="form">
          <div class="btn-toolbar">


Mime
View raw message