Merge pull request #342 from bebna/master

Fix for #302: tryoutoperation falls now back to root security object
swagger-api · Feb 17, 2015 · ef72525 · ef72525
2 parents aa111f9 + c495d64
commit ef72525
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/scripts/directives/tryoperation.js b/app/scripts/directives/tryoperation.js
@@ -356,12 +356,16 @@ SwaggerEditor.controller('TryOperation', function ($scope, formdataFilter,
     return parseHeaders(xhr.getAllResponseHeaders());
   }
 
-  $scope.getSecuirtyOptions = function () {
+  $scope.getSecurityOptions = function () {
     var none = [NONE_SECURITY];
     if (Array.isArray($scope.operation.security)) {
       return none.concat($scope.operation.security.map(function (security) {
         return Object.keys(security)[0];
       }));
+    } else if (Array.isArray($scope.specs.security)) {
+      return none.concat($scope.specs.security.map(function (security) {
+        return Object.keys(security)[0];
+      }));
     }
     return none;
   };

diff --git a/app/templates/try-operation.html b/app/templates/try-operation.html
@@ -39,8 +39,8 @@ <h4>Request</h4>
         <tr>
           <td><label>Security</label></td>
           <td>
-            <select ng-model="$parent.selectedSecurity" ng-init="$parent.selectedSecurity = getSecuirtyOptions()[0]">
-              <option ng-repeat="option in getSecuirtyOptions()" value="{{option}}" ng-disabled="!$parent.securityIsAuthenticated(option)">
+            <select ng-model="$parent.selectedSecurity" ng-init="$parent.selectedSecurity = getSecurityOptions()[0]">
+              <option ng-repeat="option in getSecurityOptions()" value="{{option}}" ng-disabled="!$parent.securityIsAuthenticated(option)">
                 {{option + (!$parent.securityIsAuthenticated(option) ? ' (Not authenticated)' : '')}}
               </option>
             </select>