Merge branch 'v0.x' into v1.1

Normation · Oct 6, 2017 · 4f4811e · 4f4811e
2 parents 5dfc682 + 960a32b
commit 4f4811e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/builder/index.html b/builder/index.html
@@ -266,7 +266,7 @@ <h4 class="panel-title">
                                 </div>
                                   <span class="pull-left">
                                     {{getMethodName(method_call)}}
-                                    <a ng-click="$event.stopPropagation();" target="_blank" ng-href="http://www.ncf.io/pages/reference.html#{{getMethodBundleName(method_call)}}">
+                                    <a ng-click="$event.stopPropagation();" target="_blank" ng-href="{{methodUrl(method_call)}}">
                                       <i class="glyphicon glyphicon-info-sign method-actions"></i>
                                     </a>
                                   </span>
@@ -433,7 +433,7 @@ <h4 id={{kind}}>{{capitaliseFirstLetter(kind)}} </h4>
                         <div class="panel-heading" style="overflow:hidden">
                             <h4 class="panel-title">
                                 <span class="pull-left"> {{method.name}}
-                                    <a ng-click="$event.stopPropagation();" target="_blank" ng-href="{{methodUrl(method, kind)}}">
+                                    <a ng-click="$event.stopPropagation();" target="_blank" ng-href="{{methodUrl(method)}}">
                                         <i class="glyphicon glyphicon-info-sign method-actions"></i>
                                     </a>
                                 </span>
@@ -458,3 +458,4 @@ <h4 id="categories">Categories</h4>
         </div>
     </body>
 </html>
+
diff --git a/builder/js/ncf.js b/builder/js/ncf.js
@@ -729,11 +729,12 @@ $scope.groupMethodsByCategory = function () {
     }
   };
 
-  $scope.methodUrl = function(method,kind) {
+  $scope.methodUrl = function(method) {
+    var name = method.bundle_name !== undefined ? method.bundle_name : $scope.getMethodBundleName(method);
     if (usingRudder) {
-      return "/rudder-doc/_generic_methods.html#"+method.bundle_name
+      return "/rudder-doc/_generic_methods.html#"+name
     } else {
-      return "http://www.ncf.io/pages/reference.html#"+method.bundle_name
+      return "http://www.ncf.io/pages/reference.html#"+name;
     }
   }