airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [43/50] [abbrv] airavata-php-gateway git commit: fixed the shaing cancellation ui update issue
Date Wed, 27 Jul 2016 17:05:51 GMT
fixed the shaing cancellation ui update issue


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

Branch: refs/heads/develop
Commit: a0c921b8d23592d3b358f0edd6b8812ba42283ad
Parents: 22c1772
Author: Jeff Kinnison <jeffdkinnison@gmail.com>
Authored: Fri Jul 15 16:51:05 2016 -0400
Committer: Jeff Kinnison <jeffdkinnison@gmail.com>
Committed: Fri Jul 15 16:51:05 2016 -0400

----------------------------------------------------------------------
 app/views/partials/sharing-display-body.blade.php |  2 +-
 app/views/partials/sharing-form-body.blade.php    |  2 +-
 public/js/sharing/share.js                        | 12 ++++++++----
 public/js/sharing/sharing_utils.js                |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a0c921b8/app/views/partials/sharing-display-body.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/sharing-display-body.blade.php b/app/views/partials/sharing-display-body.blade.php
index 32372b7..7a494fe 100644
--- a/app/views/partials/sharing-display-body.blade.php
+++ b/app/views/partials/sharing-display-body.blade.php
@@ -11,7 +11,7 @@
 </div> -->
 <label>Order By</label>
 <select class="order-results-selector">
-    <option value="username">Username</option>
+    <option value="username" selected>Username</option>
     <option value="firstlast">First, Last Name</option>
     <option value="lastfirst">Last, First Name</option>
     <option value="email">Email</option>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a0c921b8/app/views/partials/sharing-form-body.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/sharing-form-body.blade.php b/app/views/partials/sharing-form-body.blade.php
index 7f9ad99..11a701d 100644
--- a/app/views/partials/sharing-form-body.blade.php
+++ b/app/views/partials/sharing-form-body.blade.php
@@ -7,7 +7,7 @@
 </div> -->
 <label>Order By</label>
 <select class="order-results-selector">
-    <option value="username">Username</option>
+    <option value="username" selected>Username</option>
     <option value="firstlast">First, Last Name</option>
     <option value="lastfirst">Last, First Name</option>
     <option value="email">Email</option>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a0c921b8/public/js/sharing/share.js
----------------------------------------------------------------------
diff --git a/public/js/sharing/share.js b/public/js/sharing/share.js
index 83ae8ec..8d575f7 100755
--- a/public/js/sharing/share.js
+++ b/public/js/sharing/share.js
@@ -181,8 +181,8 @@ $(function() {
         e.preventDefault();
         data = $("#share-box").data();
         $share_list = $("#share-box-share").children();
-        $update_list = $('.sharing-updated');
-        share_settings = {};
+        $update_list = $('.sharing-to-update');
+        share_settings = JSON.parse($('#share-settings').val());
         if (data.hasOwnProperty('resource_id')) {
             resource_id = data.resource_id;
             updateUserPrivileges(resource_id, $share_list);
@@ -214,6 +214,8 @@ $(function() {
             }
             $('#share-box').animate({top: '100%'});
         }
+        $update_list.removeClass('sharing-to-update');
+        $update_list.addClass('updated');
         return false;
     });
 
@@ -235,15 +237,17 @@ $(function() {
                 $e.find('.sharing-thumbnail-access-text').text(access_text[access]).show();
                 $e.find('.sharing-thumbnail-unshare').hide();
             });
-            $('shared-users').removeClass('text-align-center');
+            $('#shared-users').removeClass('text-align-center');
             $original_shared_list.detach().appendTo('#shared-users');
         }
         else {
             $('#shared-users').addClass('text-align-center');
             $('#shared-users').prepend('<p>This has not been shared</p>');
         }
-        $('.sharing-updated').removeClass('sharing-updated');
+        $('.sharing-to-update').detach().appendTo($('#share-box-users'));
+        $('.sharing-to-update').addClass('share-box-users-item').removeClass('sharing-to-update
share-box-share-item');
         $('#share-box').animate({top: "100%"});
+        $('.order-results-selector').trigger('change');
         return false;
     });
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a0c921b8/public/js/sharing/sharing_utils.js
----------------------------------------------------------------------
diff --git a/public/js/sharing/sharing_utils.js b/public/js/sharing/sharing_utils.js
index bd4471a..5191de9 100644
--- a/public/js/sharing/sharing_utils.js
+++ b/public/js/sharing/sharing_utils.js
@@ -80,7 +80,7 @@ var createThumbnail = function(username, firstname, lastname, email, access,
sha
 var changeShareState = function($target) {
     var data;
     data = $target.data();
-    $target.addClass('sharing-updated');
+    $target.addClass('sharing-to-update');
     if ($target.hasClass('share-box-users-item')) {
         $target.find('.sharing-thumbnail-access').val('1').prop("disabled", false).show();
         $target.find('.sharing-thumbnail-access-text').text(access_text[access_enum.READ]).hide();


Mime
View raw message