Merge pull request #443 from carbonin/add_backlog_to_replication_ui

Add subscription backlog to replication tab
ManageIQ · Feb 27, 2017 · 4ca40d3 · 4ca40d3
2 parents a945631 + 2f94706
commit 4ca40d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/controllers/ops_controller/settings/common.rb b/app/controllers/ops_controller/settings/common.rb
@@ -277,7 +277,8 @@ def get_subscriptions_array(subscriptions)
         :user            => sub.user,
         :password        => '●●●●●●●●',
         :port            => sub.port,
-        :provider_region => sub.provider_region
+        :provider_region => sub.provider_region,
+        :backlog         => number_to_human_size(sub.backlog)
       }
     end
   end

diff --git a/app/views/ops/_settings_replication_tab.html.haml b/app/views/ops/_settings_replication_tab.html.haml
@@ -36,6 +36,7 @@
           %th= _('Username')
           %th= _('Password')
           %th= _('Port')
+          %th= _('Backlog')
           %th{:colspan => 2}=_('Actions')
         %tbody
           %tr{"ng-if" => "pglogicalReplicationModel.addEnabled"}
@@ -73,6 +74,7 @@
                                   "id"          => "port",
                                   "name"        => "port",
                                   "ng-model"    => "pglogicalReplicationModel.port"}
+            %td
             %td{:class => "action-cell"}
               %button.btn.btn-default.btn-block.btn-sm{:type => "button", "ng-disabled" => "!subscriptionValid()",  "ng-click" => "addSubscription()"}= _('Accept')
 
@@ -142,6 +144,8 @@
                                   "name"        => "port",
                                   "ng-model"    => "pglogicalReplicationModel.port"}
 
+            %td
+              {{subscription.backlog}}
             %td{:class => "action-cell", "ng-show" => "showCancelDelete($index)"}
               %button.btn.btn-default.btn-sm{:type => "button", "ng-click" => "cancelDelete($index)"}= _('Cancel Delete')