test/dummy/tmp/cache/assets/D58/C00/sprockets%2F7bd61bb28f7ce577f679872a7cc4a477 in collection-json-browser-0.0.9 vs test/dummy/tmp/cache/assets/D58/C00/sprockets%2F7bd61bb28f7ce577f679872a7cc4a477 in collection-json-browser-0.0.10

- old
+ new

@@ -1,8 +1,8 @@ -o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1377356174.713505: @value"DG{I" +o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1378655478.5090969: @value"ÕG{I" class:EFI"BundledAsset;FI"logical_path;FI"+collection_json_browser/application.js;TI" pathname;FI"q/Users/weilu/workspace/collection-json-browser/app/assets/javascripts/collection_json_browser/application.js;TI"content_type;FI"application/javascript;FI" -mtime;FI"2013-08-24T21:45:56+08:00;FI" length;Fi:EI" digest;F"%fe889e843a6c8d6c1ce8d78188a84da7I" source;FI":E/* +mtime;FI"2013-09-08T23:51:16+08:00;FI" length;FiËEI" digest;F"%da3a9cd5915228ec645b2bdc47323abeI" source;FI"ËE/* AngularJS v1.0.6 (c) 2010-2012 Google, Inc. http://angularjs.org License: MIT */ @@ -168,24 +168,24 @@ function ApiController($scope, $http, $location) { $scope.rootUrl = '/api' $scope.goTo = function(url, fromRel) { $scope.fromRel = fromRel - get(url) + $location.url(url) } $scope.submit = function() { - $scope.fromRel === 'edit-form' ? put() : post() + console.log('=============> ', $scope.item) + $scope.item === $scope.collection.href ? post() : put() } $scope.destroy = destroy $scope.$watch(function() { return $location.url(); }, function(url, oldUrl) { - if(url !== oldUrl) - get(url) + if(url !== oldUrl) { get(url) } }); $scope.$watch(function() { return $scope.item; }, function(item, oldItem) { @@ -198,17 +198,20 @@ // helpers function get(url, successHandler) { $scope.loading = true - if(successHandler === undefined) + var updateUrl = false + if(successHandler === undefined) { successHandler = responseHandler + updateUrl = true + } $http.get(url).success(function(data, status){ successHandler(data, status) - $location.url(url) - }).error(function(){ $scope.loading = false }) + if(updateUrl) $location.url(url) + }).error(responseHandler) } function destroy(url) { $scope.loading = true $http.delete(url). @@ -223,11 +226,11 @@ error(responseHandler) } function put() { $scope.loading = true - $http.put($location.url(), formData()). + $http.put($scope.collection.items[0].href, formData()). success(responseHandler). error(responseHandler) } function formData() { @@ -243,37 +246,34 @@ $scope.raw = JSON.stringify(data, undefined, 2) setTemplate(data) var items = data.collection.items - $scope.itemPaths = [{ name: "-- None (POST create) --", value: ''}] - if(items) + $scope.itemPaths = [{ name: "-- None (POST create) --", value: data.collection.href}] + if(items) { items.forEach(function(i){ $scope.itemPaths.push({name: i.href, value: i.href}) }) - $scope.item = "" + } + $scope.item = $scope.itemPaths[0].value $scope.status = status $scope.loading = false } function getTemplate(item) { - if(item === undefined || item == '') { - //TODO - //empty fields - //post - } else { - get(item, setTemplate) - //TODO - //put - } + if(item !== undefined) { get(item, setTemplate) } + $scope.loading = false } function setTemplate(data){ if(data.collection.template) { $scope.template = data.collection.template.data + } else { + $scope.template = undefined } + } } ApiController.$inject = ['$scope', '$http', '$location']; // This is a manifest file that'll be compiled into application.js, which will include all the files @@ -292,6 +292,6 @@ // ; -;FI"required_assets_digest;F"%d8bd3b3acf576a4976ec087c640dcbddI" _version;F"%6776f581a4329e299531e1d52aa59832 +;FI"required_assets_digest;F"%eef62df5d37e05a1dc54ae58478bec01I" _version;F"%6776f581a4329e299531e1d52aa59832 \ No newline at end of file