You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/08/29 16:29:53 UTC

[trafficcontrol] 03/07: Comments load in controller and no state refresh after edit create

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 8fa7c14b430adfa48061bdb5a4276bc7bf07f1c3
Author: cgillo000 <ch...@cable.comcast.com>
AuthorDate: Thu Aug 23 09:15:16 2018 -0600

    Comments load in controller and no state refresh after edit create
---
 ...ableDeliveryServiceRequestCommentsController.js | 23 +++++++++++++---------
 .../table.deliveryServiceRequestComments.tpl.html  |  8 ++++----
 .../DeliveryServiceRequestsController.js           | 11 +++++------
 .../deliveryServiceRequests/comments/index.js      |  3 ---
 .../deliveryServiceRequests.tpl.html               |  4 ++--
 .../private/deliveryServiceRequests/index.js       |  8 --------
 6 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js
index f35bc60..7ffd8b5 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js
@@ -17,16 +17,19 @@
  * under the License.
  */
 
-var TableDeliveryServicesRequestsController = function(request, comments, $scope, $state, $stateParams, $uibModal, dateUtils, locationUtils, deliveryServiceRequestService, messageModel) {
+var TableDeliveryServicesRequestsController = function(request, $scope, $state, $stateParams, $uibModal, dateUtils, locationUtils, deliveryServiceRequestService, messageModel) {
 
 	$scope.request = request[0];
 
-	$scope.comments = comments;
-
 	$scope.type = $stateParams.type;
 
-	$scope.refresh = function() {
-		$state.reload(); // reloads all the resolves for the view
+	$scope.getComments = function () {
+        deliveryServiceRequestService.getDeliveryServiceRequestComments({ deliveryServiceRequestId: $stateParams.deliveryServiceRequestId, orderby: 'id' }).
+			then(
+				function(comments) {
+					$scope.comments = comments;
+				}
+			);
 	};
 
 	$scope.createComment = function() {
@@ -54,7 +57,7 @@ var TableDeliveryServicesRequestsController = function(request, comments, $scope
 				then(
 					function() {
 						messageModel.setMessages([ { level: 'success', text: 'Delivery service request comment created' } ], false);
-						$scope.refresh();
+						$scope.getComments();
 					}
 			);
 		}, function () {
@@ -87,7 +90,7 @@ var TableDeliveryServicesRequestsController = function(request, comments, $scope
 				then(
 					function() {
 						messageModel.setMessages([ { level: 'success', text: 'Delivery service request comment updated' } ], false);
-						$scope.refresh();
+						$scope.getComments();
 					}
 				);
 		}, function () {
@@ -116,7 +119,7 @@ var TableDeliveryServicesRequestsController = function(request, comments, $scope
 				then(
 					function() {
 						messageModel.setMessages([ { level: 'success', text: 'Delivery service request comment deleted' } ], false);
-						$scope.refresh();
+						$scope.getComments();
 					}
 				);
 		}, function () {
@@ -139,7 +142,9 @@ var TableDeliveryServicesRequestsController = function(request, comments, $scope
 		});
 	});
 
+    $scope.getComments();
+
 };
 
-TableDeliveryServicesRequestsController.$inject = ['request', 'comments', '$scope', '$state', '$stateParams', '$uibModal', 'dateUtils', 'locationUtils', 'deliveryServiceRequestService', 'messageModel'];
+TableDeliveryServicesRequestsController.$inject = ['request', '$scope', '$state', '$stateParams', '$uibModal', 'dateUtils', 'locationUtils', 'deliveryServiceRequestService', 'messageModel'];
 module.exports = TableDeliveryServicesRequestsController;
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/table.deliveryServiceRequestComments.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/table.deliveryServiceRequestComments.tpl.html
index 6e65d71..d1fc2ad 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/table.deliveryServiceRequestComments.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/table.deliveryServiceRequestComments.tpl.html
@@ -40,10 +40,10 @@ under the License.
             </tr>
             </thead>
             <tbody>
-            <tr ng-click="editComment(c)" ng-repeat="c in ::comments">
-                <td data-search="^{{::c.author}}$">{{::c.author}}</td>
-                <td data-search="^{{::c.comment}}$">{{::c.value}}</td>
-                <td data-search="^{{::getRelativeTime(c.lastUpdated)}}$" data-order="{{::c.lastUpdated}}">{{::getRelativeTime(c.lastUpdated)}}</td>
+            <tr ng-click="editComment(c)" ng-repeat="c in comments">
+                <td data-search="^{{c.author}}$">{{c.author}}</td>
+                <td data-search="^{{c.comment}}$">{{c.value}}</td>
+                <td data-search="^{{getRelativeTime(c.lastUpdated)}}$" data-order="{{c.lastUpdated}}">{{getRelativeTime(c.lastUpdated)}}</td>
                 <td><button type="button" class="btn btn-link" title="Delete Comment" ng-click="deleteComment(c, $event)"><i class="fa fa-trash-o"></i></button></td>
             </tr>
             </tbody>
diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/DeliveryServiceRequestsController.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/DeliveryServiceRequestsController.js
index bdaa6e1..8ea0e6e 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/DeliveryServiceRequestsController.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/DeliveryServiceRequestsController.js
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-var DeliveryServiceRequestsController = function(isEditing, myId, $scope) {
-
-	$scope.isEdit = (isEditing == true) ? true : false;
-	$scope.thisid = myId;
-
+var DeliveryServiceRequestsController = function($scope, $state) {
+    $scope.isState = function(state) {
+        return $state.current.name.indexOf(state) !== -1;
+    };
 };
 
-DeliveryServiceRequestsController.$inject = ['isEditing', 'myid', '$scope'];
+DeliveryServiceRequestsController.$inject = ['$scope', '$state'];
 module.exports = DeliveryServiceRequestsController;
diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js
index 824a3b1..b04ae8a 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js
@@ -29,9 +29,6 @@ module.exports = angular.module('trafficPortal.private.deliveryServiceRequests.c
 						resolve: {
 							request: function($stateParams, deliveryServiceRequestService) {
 								return deliveryServiceRequestService.getDeliveryServiceRequests({ id: $stateParams.deliveryServiceRequestId });
-							},
-							comments: function($stateParams, deliveryServiceRequestService) {
-								return deliveryServiceRequestService.getDeliveryServiceRequestComments({ deliveryServiceRequestId: $stateParams.deliveryServiceRequestId, orderby: 'id' });
 							}
 						}
 					}
diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/deliveryServiceRequests.tpl.html b/traffic_portal/app/src/modules/private/deliveryServiceRequests/deliveryServiceRequests.tpl.html
index 552a8b0..b462311 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/deliveryServiceRequests.tpl.html
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/deliveryServiceRequests.tpl.html
@@ -18,10 +18,10 @@ under the License.
 -->
 
 <div class="row">
-    <div class="col-md-6 col-sm-6 col-xs-12">
+    <div ng-class="isState('trafficPortal.private.deliveryServiceRequests.list') ? 'col-md-12 col-sm-12 col-xs-12' : 'col-md-6 col-sm-6 col-xs-12'">
         <div ui-view="deliveryServiceRequestsContent"></div>
     </div>
-    <div class="col-md-6 col-sm-6 col-xs-12">
+    <div class="col-md-6 col-sm-6 col-xs-12" ng-show="isState('trafficPortal.private.deliveryServiceRequests.edit')">
         <div ui-view="deliveryServiceRequestsComments"></div>
     </div>
 </div>
diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/index.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/index.js
index a31125b..c7c74f7 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/index.js
@@ -28,14 +28,6 @@ module.exports = angular.module('trafficPortal.private.deliveryServiceRequests',
 					privateContent: {
 						templateUrl: 'modules/private/deliveryServiceRequests/deliveryServiceRequests.tpl.html',
                         controller: 'DeliveryServiceRequestsController',
-                        resolve: {
-                            isEditing: function($stateParams, deliveryServiceRequestService) {
-                                return deliveryServiceRequestService.getDeliveryServiceRequests({ id: $stateParams.deliveryServiceRequestId });
-                            },
-                            myId: function($stateParams, deliveryServiceRequestService) {
-                                return deliveryServiceRequestService.getDeliveryServiceRequestComments({ deliveryServiceRequestId: $stateParams.deliveryServiceRequestId, orderby: 'id' });
-                            }
-                        }
 					}
 				}
 			})