[balrog-ui] Merge pull request #11 from bhearsum/linkify-mappings

bug 1109071: Linkify mapping to populated search of releases page. r=peterbe
mozilla-releng · Dec 18, 2015 · c052356 · c052356
2 parents bc1f19e + 938427d
commit c052356
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 6 deletions.
diff --git a/ui/app/js/controllers/release_data_controller.js b/ui/app/js/controllers/release_data_controller.js
@@ -1,6 +1,5 @@
 angular.module('app').controller('ReleaseDataCtrl',
 function($scope, $http, $modalInstance, Releases, Rules, release, diff) {
-
   $scope.release = release;
   $scope.diff = diff;
 

diff --git a/ui/app/js/controllers/rules_controller.js b/ui/app/js/controllers/rules_controller.js
@@ -1,5 +1,5 @@
 angular.module("app").controller('RulesController',
-function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $route) {
+function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $route, Releases) {
 
   $scope.loading = true;
   $scope.failed = false;
@@ -228,4 +228,33 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
   };
   /* End openDeleteModal */
 
+  $scope.openReleaseDataModal = function(mapping) {
+    Releases.getRelease(mapping)
+    .success(function(response) {
+      // it's the same rule, but this works
+      var modalInstance = $modal.open({
+        templateUrl: 'release_data_modal.html',
+        controller: 'ReleaseDataCtrl',
+        size: 'lg',
+        resolve: {
+          release: function () {
+            return response;
+          },
+          diff: function() {
+            return false;
+          }
+        }
+      });
+    })
+    .error(function() {
+      console.error(arguments);
+      $scope.failed = true;
+    })
+    .finally(function() {
+      $scope.loading = false;
+    });
+  };
+  /* End openDataModal */
+
+
 });
diff --git a/ui/app/templates/rules.html b/ui/app/templates/rules.html
@@ -84,7 +84,17 @@ <h3 class="panel-title">
     <div class="left" style="float: left">
 
       <h5 title="Mapping">
-        Mapping: <b ng-bind-html="highlightSearch(rule.mapping, 'mapping')"></b>
+        Mapping: <span ng-show="rule.mapping">
+            <b ng-bind-html="highlightSearch(rule.mapping, 'mapping')"></b>
+            <a class="btn btn-default btn-xs" href="" ng-click="openReleaseDataModal(rule.mapping)">
+                <i class="glyphicon glyphicon-eye-open"></i>
+                View
+            </a>
+            <a class="btn btn-default btn-xs" href="/releases/#{{ rule.mapping }}">
+                <i class="glyphicon glyphicon-pencil"></i>
+                Edit
+            </a>
+        </span>
       </h5>
       <h5 title="Data version">
         Data version: <b>{{ rule.data_version }}</b>

diff --git a/ui/dist/js/app.js b/ui/dist/js/app.js