Fix app import local file. Fix dfReplaceParams user id

app/admin_components/adf-application/dreamfactory-application.js

@@ -413,7 +413,6 @@ angular.module('dfApplication', ['dfUtility', 'dfUserManagement', 'ngResource'])
             var params = options.params;
             params['api'] = api;
 
-
             // return response from server as promise
             return dfSystemData.resource(options).post(params, options.data, function(result) {
 
@@ -932,8 +931,7 @@ angular.module('dfApplication', ['dfUtility', 'dfUserManagement', 'ngResource'])
                     headers: ''
                 };
 
-                options = dfObjectService.mergeObjects(defaults, options);
-
+                options = dfObjectService.mergeObjects(options, defaults);
 
                 // Return a resource for our service so we can just call the operation we want.
                 return $resource(DSP_URL + '/rest/system/:api/:id', {api: '@api', id: '@id'}, {
@@ -944,7 +942,7 @@ angular.module('dfApplication', ['dfUtility', 'dfUserManagement', 'ngResource'])
                     },
                     post: {
                         method: 'POST',
-                        headers: options.headers
+                        headers: options.headers,
                     },
                     put: {
                         method: 'PUT',

app/admin_components/adf-apps/dreamfactory-apps.js

@@ -552,7 +552,6 @@ angular.module('dfApps', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp', 'df
                         }
                     });
 
-                    console.log(scope.app);
 
                 });
 
@@ -966,7 +965,7 @@ angular.module('dfApps', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp', 'df
         }
     }])
 
-    .directive('dfImportApp', ['MOD_APPS_ASSET_PATH', 'dfApplicationData', 'dfNotify',  function(MOD_APPS_ASSET_PATH, dfApplicationData, dfNotify) {
+    .directive('dfImportApp', ['MOD_APPS_ASSET_PATH', '$http', 'dfApplicationData', 'dfNotify',  function(MOD_APPS_ASSET_PATH, $http, dfApplicationData, dfNotify) {
 
         return {
 
@@ -1053,15 +1052,13 @@ angular.module('dfApps', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp', 'df
                     };
 
                     if (scope._isAppPathUrl(scope.appPath)) {
-
                         _options['headers'] = {
                             "Content-type" : 'application/json'
                         }
-
                     }
                     else {
-                        _options['headers'] = {"Content-type" : undefined};
-                        _options['transformRequest'] = angular.identity
+                        _options['headers'] = {"Content-type" :  undefined};
+                        $http.defaults.transformRequest = angular.identity;
                     }
 
                     return dfApplicationData.saveApiData('app', _options).$promise;
@@ -1105,7 +1102,10 @@ angular.module('dfApps', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp', 'df
                     else {
 
                         var fd = new FormData();
+
                         fd.append('files', scope.uploadFile);
+                        // fd.append("files", $('input[type=file]')[0].files[0]);
+                        // fd.append("text", 'asdfasdsfasdfasdf');
                         requestDataObj = fd
                     }
 
@@ -1134,13 +1134,21 @@ angular.module('dfApps', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp', 'df
                             }
 
                             dfNotify.error(messageOptions);
+
+
                         }
                     )
                         .finally(
                         function(success) {
 
                             scope._resetImportApp();
 
+                            $http.defaults.transformRequest = function (d, headers) {
+
+                                if (angular.isObject(d)) {
+                                    return angular.toJson(d);
+                                }
+                            }
                         }
                     )
                 };
@@ -1185,6 +1193,13 @@ angular.module('dfApps', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp', 'df
                     }
                 });
 
+                var watchUploadFile = scope.$watch('uploadFile', function (n , o) {
+
+                    if (!n) return;
+
+                    scope.appPath = n.name;
+                })
+
 
                 // MESSAGES
                 scope.$on('$destroy', function (e) {

app/admin_components/adf-apps/views/df-import-app.html

@@ -6,7 +6,7 @@
         <div class="col-xs-12">
             <div class="panel panel-default">
                 <div class="panel-body">
-                    <form data-ng-submit="submitApp()" class="" >
+                    <form data-ng-submit="submitApp()" name="uploadForm" class="" >
                         <div class="row">
                             <div class="col-lg-6" >
                                 <div class="input-group" >
@@ -39,7 +39,7 @@
                             </div>
                         </div>
 
-                        <input style="display: none" type="file" id="upload" name="upload" data-file-model="uploadFile" />
+                        <input style="display: none" type="file" id="upload" name="upload" data-ng-model="uploadFile" data-file-model="uploadFile" file-model-2 />
                         <input type="submit" class="btn btn-default btn-primary" value="Import" />
                     </form>
                 </div>

app/admin_components/adf-utility/dreamfactory-utility.js

@@ -1235,6 +1235,31 @@ angular.module('dfUtility', ['dfApplication'])
         }
     ])
 
+    .directive('fileModel2', [
+        '$parse', function ($parse) {
+            return {
+                restrict: 'A',
+                scope: false,
+                link: function (scope, element, attrs) {
+
+                    var model = $parse(attrs.fileModel);
+                    var modelSetter = model.assign;
+
+                    element.on(
+                        'change', function () {
+                            scope.$apply(
+                                function () {
+
+                                    modelSetter(scope, element[0].files[0]);
+                                }
+                            );
+                        }
+                    );
+                }
+            };
+        }
+    ])
+
     // Helper directive for tabbed interfaces
     .directive('showtab',[function () {
         return {
@@ -3016,7 +3041,7 @@ angular.module('dfUtility', ['dfApplication'])
                                         break;
                                     case "{user_id}":
                                         // value = top.CurrentSession.id;
-                                        value = UserDataService.getCurrentUser().session_id;
+                                        value = UserDataService.getCurrentUser().id;
                                         break;
                                     case "{app_name}":
                                         value = appName;

dist/admin_components/adf-apps/views/df-import-app.html

@@ -1 +1 @@
-<div> <df-section-header data-title="'Import Application'"></df-section-header> <div class="row"> <div class="col-xs-12"> <div class="panel panel-default"> <div class="panel-body"> <form data-ng-submit="submitApp()" class=""> <div class="row"> <div class="col-lg-6"> <div class="input-group"> <span class="input-group-btn"> <button class="btn btn-default" type="button" data-ng-click="browseFileSystem()">Browse</button> </span> <input type="text" class="form-control" data-ng-model="appPath" placeholder="Click sample app, enter url, or browse for app package."> </div><!-- /input-group --> </div><!-- /.col-lg-6 --> </div> <br> <div class="row"> <div class="col-lg-6"> <div class="form-group"> <select class="form-control" data-ng-model="storageService" data-ng-options="obj as obj.name for obj in services" data-ng-disabled="!appPath || uploadFile != null"> <option value="">-- Select Storage Service -- </select> </div> </div> </div> <div class="row"> <div class="col-lg-6"> <div class="form-group"> <select class="form-control" data-ng-model="storageContainer" data-ng-options="container as container for container in containers" data-ng-disabled="!appPath || uploadFile != null || !containers.length"> <option value="">-- Select Storage Container-- </select> </div> </div> </div> <input style="display: none" type="file" id="upload" name="upload" data-file-model="uploadFile"> <input type="submit" class="btn btn-default btn-primary" value="Import"> </form> </div> </div> </div> <div class="col-xs-12"> <div class="panel panel-default"> <!-- Default panel contents --> <div class="panel-heading">Sample Applications</div> <div class="panel-body"> <p>Dreamfactory provides sample apps to help you get started. Click one of the sample apps below and select your storage service. Click 'Import' to install the sample app. These and other sample apps can be found at <a target="_blank" href="https://github.com/dreamfactorysoftware">github/dreamfactorysoftware</a>.</p> </div> <ul class="list-group"> <li class="list-group-item" data-ng-repeat="app in sampleApps"><a data-ng-click="loadSampleApp(app)">{{app.name}}</a> - {{app.descr}}</li> </ul> </div> </div> </div> </div>
+<div> <df-section-header data-title="'Import Application'"></df-section-header> <div class="row"> <div class="col-xs-12"> <div class="panel panel-default"> <div class="panel-body"> <form data-ng-submit="submitApp()" name="uploadForm" class=""> <div class="row"> <div class="col-lg-6"> <div class="input-group"> <span class="input-group-btn"> <button class="btn btn-default" type="button" data-ng-click="browseFileSystem()">Browse</button> </span> <input type="text" class="form-control" data-ng-model="appPath" placeholder="Click sample app, enter url, or browse for app package."> </div><!-- /input-group --> </div><!-- /.col-lg-6 --> </div> <br> <div class="row"> <div class="col-lg-6"> <div class="form-group"> <select class="form-control" data-ng-model="storageService" data-ng-options="obj as obj.name for obj in services" data-ng-disabled="!appPath || uploadFile != null"> <option value="">-- Select Storage Service -- </select> </div> </div> </div> <div class="row"> <div class="col-lg-6"> <div class="form-group"> <select class="form-control" data-ng-model="storageContainer" data-ng-options="container as container for container in containers" data-ng-disabled="!appPath || uploadFile != null || !containers.length"> <option value="">-- Select Storage Container-- </select> </div> </div> </div> <input style="display: none" type="file" id="upload" name="upload" data-ng-model="uploadFile" data-file-model="uploadFile" file-model-2> <input type="submit" class="btn btn-default btn-primary" value="Import"> </form> </div> </div> </div> <div class="col-xs-12"> <div class="panel panel-default"> <!-- Default panel contents --> <div class="panel-heading">Sample Applications</div> <div class="panel-body"> <p>Dreamfactory provides sample apps to help you get started. Click one of the sample apps below and select your storage service. Click 'Import' to install the sample app. These and other sample apps can be found at <a target="_blank" href="https://github.com/dreamfactorysoftware">github/dreamfactorysoftware</a>.</p> </div> <ul class="list-group"> <li class="list-group-item" data-ng-repeat="app in sampleApps"><a data-ng-click="loadSampleApp(app)">{{app.name}}</a> - {{app.descr}}</li> </ul> </div> </div> </div> </div>

dist/index.html

@@ -2,4 +2,4 @@
       <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-options="topLevelNavOptions"></df-top-level-nav-std> <div data-ng-if="showAdminComponentNav" style="margin: 10px auto"> <!-- Component nav and title --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <df-component-title></df-component-title> <df-component-nav data-options="componentNavOptions"></df-component-nav> </div> </div> </div> </div> <!-- Rendering Context --> <div class="container-fluid"> <div class="row"> <div class="col-xs-12"> <div class="row"> <div data-ng-view=""></div> </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.e698c818.js"></script> <script src="scripts/app.21ad937a.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="/static/pnotify/2.0.1/js/pnotify.custom.min.js" defer></script>  
+    <![endif]--> <script src="scripts/vendor.e698c818.js"></script> <script src="scripts/app.806e8213.js"></script> <!-- other deps --> <script src="vendor/ace/ace.js"></script> <script src="vendor/ace/mode-javascript.js"></script> <script src="/static/pnotify/2.0.1/js/pnotify.custom.min.js" defer></script>