airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject airavata-php-gateway git commit: Updating storage resource delete ui
Date Fri, 12 Feb 2016 18:29:35 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop 71177ca78 -> bac3b46ca


Updating storage resource delete ui


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

Branch: refs/heads/develop
Commit: bac3b46cade448c7957c7176d592e15d1f865063
Parents: 71177ca
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Fri Feb 12 13:28:58 2016 -0500
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Fri Feb 12 13:28:58 2016 -0500

----------------------------------------------------------------------
 app/controllers/StorageResourceController.php | 9 ++++-----
 app/views/storage-resource/browse.blade.php   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bac3b46c/app/controllers/StorageResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/StorageResourceController.php b/app/controllers/StorageResourceController.php
index a54639a..d060c6f 100644
--- a/app/controllers/StorageResourceController.php
+++ b/app/controllers/StorageResourceController.php
@@ -4,7 +4,7 @@ class StorageresourceController extends BaseController
 {
 
     /**
-     *    Instantiate a new Compute Resource Controller Instance
+     *    Instantiate a new Storage Resource Controller Instance
      **/
 
     public function __construct()
@@ -25,7 +25,6 @@ class StorageresourceController extends BaseController
     public function createSubmit()
     {
         $this->beforeFilter('verifyeditadmin');
-        //Compute resource is by default enabled
         $storageDescription = array(
             "hostName" => trim(Input::get("hostname")),
             "storageResourceDescription" => trim(Input::get("description")),
@@ -51,7 +50,6 @@ class StorageresourceController extends BaseController
             $storageResource = SRUtilities::get_storage_resource($storageResourceId);
             $dataMovementInterfaces = array();
             $addedDMI = array();
-            //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId,
1) ); exit;
             
             if (count($storageResource->dataMovementInterfaces)) {
                 foreach ($storageResource->dataMovementInterfaces as $DMI) {
@@ -79,7 +77,6 @@ class StorageresourceController extends BaseController
             $storageResourceDescription = SRUtilities::get_storage_resource(Input::get("srId"));
             $storageResourceDescription->hostName = trim(Input::get("hostname"));
             $storageResourceDescription->resourceDescription = Input::get("description");
-            //var_dump( $computeDescription); exit;
 
             $storageResource = SRUtilities::register_or_update_storage_resource($storageResourceDescription,
true);
 
@@ -112,6 +109,7 @@ class StorageresourceController extends BaseController
         return Redirect::to("sr/edit?srId=" . Input::get("srId") . $tabName);
     }
 
+    /*
     public function srView()
     {
         $data = CRUtilities::getEditCRData();
@@ -155,6 +153,7 @@ class StorageresourceController extends BaseController
             return View::make("resource/browse")->with("login-alert", "Unable to retrieve
this Compute Resource. Please report this error to devs.");
 
     }
+    */
 
     public function deleteActions()
     {
@@ -164,7 +163,7 @@ class StorageresourceController extends BaseController
             return Redirect::to("sr/edit?srId=" . Input::get("srId") . "#tab-dataMovement")
                 ->with("message", "Data Movement Protocol was deleted successfully");
         } elseif (Input::has("del-srId")) {
-            return Redirect::to("sr/browse")->with("message", "The Compute Resource has
been successfully deleted.");
+            return Redirect::to("sr/browse")->with("message", "The Storage Resource "
. Input::get("del-srId") . " has been successfully deleted.");
         } else
             return $result;
     }

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bac3b46c/app/views/storage-resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/browse.blade.php b/app/views/storage-resource/browse.blade.php
index 50fe0a7..a6ca0e7 100644
--- a/app/views/storage-resource/browse.blade.php
+++ b/app/views/storage-resource/browse.blade.php
@@ -154,7 +154,7 @@
     });
 
     $(".del-sr").click(function () {
-        $(".delete-sr-id").html("'" + $(this).data("delete-sr-id") + "'");
+        $(".delete-sr-id").html("'" + $(this).data("srid") + "'");
         $(".delete-srId").val($(this).data("srid"));
     });
 


Mime
View raw message