Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/admin_components/adf-services/dreamfactory-services.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ angular.module('dfServices', ['ngRoute', 'dfUtility'])

}])

.controller('ServicesCtrl', ['$rootScope', '$scope', 'dfApplicationData', 'dfNotify', '$location', function ($rootScope, $scope, dfApplicationData, dfNotify, $location) {
.controller('ServicesCtrl', ['$rootScope', '$scope', 'dfApplicationData', 'dfNotify', '$location', 'SystemConfigDataService', function ($rootScope, $scope, dfApplicationData, dfNotify, $location, SystemConfigDataService) {

$scope.$parent.title = 'Services';
$scope.$parent.titleIcon = 'cubes';
Expand Down Expand Up @@ -66,11 +66,13 @@ angular.module('dfServices', ['ngRoute', 'dfUtility'])
// eventlist is loaded only as needed to improve user experience
var apis = ['service', 'service_link', 'storage_service_link', 'service_type', 'environment'];

var resourcesWrapper = SystemConfigDataService.getSystemConfig().config.resources_wrapper;

dfApplicationData.getApiData(apis).then(
function (response) {
var newApiData = {};
apis.forEach(function(value, index) {
newApiData[value] = response[index].resource ? response[index].resource : response[index];
newApiData[value] = response[index][resourcesWrapper] ? response[index][resourcesWrapper] : response[index];
});
$scope.apiData = newApiData;
if (init) {
Expand Down
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]--> <!-- Add your site or application content here --> <div id="dreamfactoryApp" data-ng-controller="MainCtrl" df-popup-login> <div id="popup-login-container"></div> <!-- Top level Nav --> <df-top-level-nav-std data-ng-if="showHeader" data-options="topLevelNavOptions"></df-top-level-nav-std> <df-license-expired-banner data-ng-if="showLicenseExpiredBanner"></df-license-expired-banner> <div data-ng-if="showAdminComponentNav" style="margin: 10px auto;" class="df-menu"> <!-- Component nav and title --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <div class="col-md-2 df-menu-container df-menu-icon"> <df-component-title></df-component-title> </div> <div class="col-md-10 df-menu-container second-nav-menu-items"> <df-component-nav data-options="componentNavOptions"></df-component-nav> </div> </div> </div> </div> </div> <!-- Rendering Context --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <div data-ng-view=""></div> </div> </div> </div> <!--<df-main-loading></df-main-loading>--> <div id="mask"></div> </div> <!--[if lt IE 9]>
<script src="scripts/oldieshim.d41d8cd9.js"></script>
<![endif]--> <script src="scripts/vendor.85f12eba.js"></script> <script src="scripts/app.2a589f01.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="vendor/ace/mode-json.js"></script> <script src="vendor/ace/mode-yaml.js"></script> <script> setTimeout(function(){
<![endif]--> <script src="scripts/vendor.85f12eba.js"></script> <script src="scripts/app.05a1ec0d.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="vendor/ace/mode-json.js"></script> <script src="vendor/ace/mode-yaml.js"></script> <script> setTimeout(function(){

var _updateIntercom = function(userData) {
var host = $body.injector().get("$location").host();
Expand Down
1 change: 1 addition & 0 deletions dist/scripts/app.05a1ec0d.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/scripts/app.2a589f01.js

This file was deleted.