Repository: airavata-php-gateway Updated Branches: refs/heads/master 3a69012f3 -> 38b5df020
AIRAVATA-1538 PGA fixes 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/38b5df02 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/38b5df02 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/38b5df02 Branch: refs/heads/master Commit: 38b5df0203d7ee315488a897951e3b1b89ddbe75 Parents: 3a69012 Author: Supun Nakandala <[email protected]> Authored: Sun Jul 5 21:25:23 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Sun Jul 5 21:25:23 2015 +0530 ---------------------------------------------------------------------- app/libraries/AppUtilities.php | 3 --- app/views/partials/interface-block.blade.php | 14 +++++++------- app/views/partials/interface-input-block.blade.php | 2 +- app/views/partials/interface-output-block.blade.php | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/38b5df02/app/libraries/AppUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/AppUtilities.php b/app/libraries/AppUtilities.php index a375dae..3ad7f9d 100644 --- a/app/libraries/AppUtilities.php +++ b/app/libraries/AppUtilities.php @@ -42,9 +42,6 @@ class AppUtilities $modules = AppUtilities::getAllModules(); $appInterfaces = Airavata::getAllApplicationInterfaces(Session::get("gateway_id")); - - $InputDataObjectType = new InputDataObjectType(); - return array( "appInterfaces" => $appInterfaces, "dataTypes" => $dataType::$__names, http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/38b5df02/app/views/partials/interface-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/interface-block.blade.php b/app/views/partials/interface-block.blade.php index fe28608..bb6e841 100644 --- a/app/views/partials/interface-block.blade.php +++ b/app/views/partials/interface-block.blade.php @@ -16,20 +16,20 @@ <label class="control-label">Application Modules</label> <div class="app-modules"> + <div class="input-group"> + <select name="applicationModules[]" class="app-module-select form-control" style="min-width: 200px" readonly> @if( isset( $interfaceObject)) @for( $i=0; $i< count( $interfaceObject->applicationModules); $i++ ) - <div class="input-group"> - <select name="applicationModules[]" class="app-module-select form-control" readonly> @foreach( $modules as $index => $module) - <option value="{{ $module->appModuleId }}" - @if( $interfaceObject->applicationModules[$i] == $module->appModuleId) selected @endif>{{ - $module->appModuleName}}</option> + @if( $interfaceObject->applicationModules[$i] == $module->appModuleId) + <option value="{{ $module->appModuleId }}" selected>{{$module->appModuleName}}</option> + @endif @endforeach + @endfor + @endif </select> <span class="input-group-addon hide remove-app-module" style="cursor:pointer;">x</span> </div> - @endfor - @endif </div> <button type="button" class="hide btn btn-default add-app-module">Add Application Module</button> </div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/38b5df02/app/views/partials/interface-input-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/interface-input-block.blade.php b/app/views/partials/interface-input-block.blade.php index 306e84b..5062adb 100644 --- a/app/views/partials/interface-input-block.blade.php +++ b/app/views/partials/interface-input-block.blade.php @@ -71,7 +71,7 @@ <label class="control-label col-md-4">Data is Staged?</label> <div class="col-md-8"> - <select name="dataStaged[]" class="form-control"> + <select name="dataStaged[]" readonly class="form-control"> <option>select</option> <option value="1" @if( isset( $appInputs) ) @if( $appInputs->dataStaged == 1) selected @endif @endif>True</option> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/38b5df02/app/views/partials/interface-output-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/interface-output-block.blade.php b/app/views/partials/interface-output-block.blade.php index 9ed1813..97f1ea6 100644 --- a/app/views/partials/interface-output-block.blade.php +++ b/app/views/partials/interface-output-block.blade.php @@ -43,7 +43,7 @@ <label class="control-label col-md-3">Data Movement</label> <div class="col-md-9"> - <select name="dataMovement[]" class="form-control"> + <select name="dataMovement[]" readonly class="form-control"> <option>select</option> <option value="1" @if( isset( $appOutputs) ) @if( $appOutputs->dataMovement == 1) selected @endif @endif>True</option>
