Don't clobber staggeredMaxAge = 0 (fixes #604)

auto/gui.files.go

@@ -28,7 +28,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["angular.min.js"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7dff73db36b2f8effe2b107d729594c89493f432f789a3f4a56e72cfd734c9c449efcdb8be37940449ac2952e5173b7e89fff7b7bb00497ca528dbedddcd3c4d1b4bc462b1582c16bb8b05381eb3a374739545cb55c1064743f6f8e0d1b7ec6fe1793a65dfa7d99285c91c2092228ba6659166391be49cb362c5d9d1bbb71f3f1c7fffe9e3bb0f276c11c57c18ec01ba9771cc085dce329ef3ec82cf03f629e72c5d40b52867795a6633ce66e99c33f8b94c2f7896f0399b5e4163eca7e38ffb79711573c41547339ee4d85c58b019944e395ba42590142544c39be3a3576f4f5e51f3c1dedef8c1af791c25059b66e925b4fd8c1559c947d056524449c9abdf9bb8ccf17ff19b3d1843cd659c4ec398dd7fc616619c0350982ccb38cce46f04daeb97f025075ecc8afee1dede4598b1fc2a9941b792259b543582753a2f633ee8d765fd113bed6fc27c16c69b8ccf564550646192c761c1fb67c343425466f13404f413d607be11feba7e001d5844cbc1a28407519ab0c1fd55516cde67e94534e7d988ddaff155cf86eccb1e838f0618ccf9222ce3220f3ee7d9e23f7908cfde866b6af4bff68f4e3ebcdeff989ef3041adf52f7284dcf235ed5d56a8aaa164101f0eea4088b68f61a062b7f9362e30341247e80318be8f333d68f818dfbfd515d90970b5110fc9aa7499f9e5f03d3f07f9d454596c63120edbfbae04971546431305ee1593e4b3730b0d4ad9a3ff43088c3bca05ad09da48c63c1001c172c39fe011e1fc8aed1a897b319cff3d7093c6f1a98874558e15570dfe7eba818f43f1dbf4b4038797f2811e1275ab0816ce1053b502be30711068b347b15ce56cae07324d484c50ff0204f6126c4e972d023a8de88d1df209a57df8a2b6482f84e141f5a7834c2ad5a46856be5f7b5d2350767b1b953ea54cc9365b162fbecd15953bb66b55915a85710e7bcf818ad795a160a4f4c76d020074b5e0caa89f590f5c7447ffe5d1e25333ee9c323d1e450ab1ac8d11dd4a36c94f32c4bb301fd0b654aef47eccf0707f2c1b5222e12743761592c2c69b97dcfe308d04f1ef5efaec78f0eac2eef48415beb56cb2db3fea47ada3ef3556d09dfe374162254c5461c2fd045173f40b198f5d553e8d0bb1fe111ae19cdd324bc8896802159bebc0caf708871b968ca539af4f67354f2615688954396a91a6996ae373127fa27eccbf5a15e86cb81eff971829cd0086dca134e3cc9edcac4637c7e7aa63d87d58cc736f8fa8aa66abfaf3d4d00d8816393a5453a4be3a315287758eb356e48988c6fd2ac00b6877663a2ec3d0c4bc42fbdb51d9d02632579851db3492d37cb0cd6a0e364913aeac14a55a173cbf4c3de1857aadeb016df46deb02057e725d832af23305bd0665944595e300429c325af2c993882871bb156922d840f61c9ccfa7965cda8d8c82202eb2994eb265a576183f492b35578c15978114671388525817d143546acc7939e8a2a47dd2c1b942db1cb08acb87558cc5604ce807ff077ffd309ac27972b58bf59ef7f56fb1fffde2348159ba804427f5583a00999a405fd3e7adb0b1a7d26d6d7643912d5602e34aa05963d364080886621fc794eb0b95c3be0c9c387a6ee43000027b8d3e84c5fa8c45a0b4a432e3ecfd963cf224ac6a2b1ca69bf2a72a1ad8b308ee66f8830b0420b50448d1c8048e611701f8b5d4d01bf3ee2d8636d5008455919c2381663d41063510686632c06654a1213a7978a3c28e866209901fb3b9ad7eb4d9881e99c0af1c20a58c8c0dace913832c7792d324e6468a2d7a294c3d7380e2c40b593c00ff56750a46fb0e123687830b46ae28068e072605e3065985c7cc38f6097de1c4c31fef9dd824679c826b5f6d606927134e75b91c62a327d103d48bd1651d5cf4a62ea3e4ed82357d79ab5090de6badae9c199c34e13e4fa04f55a533f2041d370768ec4c06424e125e47cbee7691b677eb5b20fa5161c5c025bd2cb613085bf83fe94c334e565128335afacb89a4d622d90cdb2743dd4d7bcfb50b557afc862b13811dab5a7aee72afa4a87a0d958d504b51f6660320f032c3934ac6d7b2e1a1d279043838f26ad09e7f397cd5a5a43f7b3751f9c951f78acf830f0701e65f239d87e5136544bd19ec1425cb7d5e7455ace5658f06933475f51145d9b641ccf3c44647c0ddeb5930ebba8220286578ea7831030977916e5e73529e6f0356e8e3a6064fb814b9d69acc7e190e6d137dfb07b8d45648e8f29e7d7cd12a2ba3c9a8b558fada02d4ac0ac561ed76659238da225db2aab310dfaff2fe1c5659a9d9349d11fa26d14c683fe0a166dad4d806c30b5c3e5abb24096bba15c3344710ebaf1d898815fbfb27ba2fbb7e073e39d581c35d88614b48cad97ab5b6720f102430a5c9a951dd881da622e4c4c2821ff57a754357a85ab8a96e59945b51b8cec462e3d5d58fd3a75e10d68adf818571b31cd6fdd0fb00881dfab0f40d1a0a64df523613d104d31c5cb40d2cb9cec2eb43684254f76269800f98a8c098cdf2132b0458a5560ce31b2c1556ebc451c8e0006e23e5a38a639d17d54d3540112a2e31f464ced4dcdd9b6a9f201d45cc1ff08e6fa3b4150d8139b7e27cdd8d91fa25c3a6b9d280629e4309ab69b775a752088e6671691d8124ea07cb08d9ea31d88a109bf8514cf7cf2816b8b5bdd4e32dde4cfd8c1c82a49cbc257749c7c7f55f0fc635a84b113e05d596c8178399f03f3007d4d61084f74b8eb4377f72aa1d8debbff2e04018f0e0ebca85b94ca11850228caea183373b8b4f841f06e4323107cfaf0126caf4d810efbc48e4e8216395e808f8a0ea770d071d95c81a33005af9b251c7404f89261852301cd32e7335c25e6231313e898cb101c51f057c2fcbcf67ef1f73a3c07f783cd56693403e7e6fb9234d23c4dfa05d53151419569b944146b362f33240a57ff288c3180566e462c4f49a7f102d152249b149a85088828a235af7c25e1b95f447954808fb5e289dc98101840356e70c7c32628949e3fe102b0754aba344c703323632bf8073cf9653a42aa64ef4d1cbf95b082a269bba795a0aa22b27e46aa70e14967e51a43a6822a54367138e383f1e0bb67f0df3fbe060f0e7fc91f0c9b4af0eb9709fc3338fdc7e1d98361f0e0fef0eb3fe0dff188f5ee3fea397c997b4d65970b63900044f59a0a931e7bc830b6061af1120cf987ac77b80e3fef831051d19383078fbf7df0e4e981e16579dd3624e8a1c282e72af67d26703da028a5dbe74303a4749a1d75dbad0e56e51bd1aac1a729cc343e7f0dff6af1a37a02aaeb07ad04c6c273ced147ea2960c81684344c2abdad53a867695507088a887cda124326be38a3b864f17c87e450fc9c271824f8f4e118d7bb348151179d7245c5cc88b7d6986a4f91f1208d287b34f0a36d74a8ac1a11a7c442eb1a4973ef42c4af47e4055806a78785f562e91ed9932bf091d61a4bddaccc09b0Line truncated
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec7d6b731b37b2e877fd0a98d71b92363594edac6baf653ad751ecbdda38b6cbb2b3a74ad19e1a922039d17086998764aeadff7eba1b98193c87a347b2bb55879558e40068341a8d7ea181198fd951bad966d17255b0c1d1903d3e78f42dfb5b789e4ed9f769b6646132871a499145d3b248b39c0d72ce59b1e2ece8dddb8f1f8ebffff4f1dd8713b688623e0cf600dccb3866042e6719cf7976c1e701fb9473962ea05994b33c2db31967b374ce19fc5ca6173c4bf89c4db7d019fbe9f8e37e5e6c638eb0e268c6931cbb0b0b3683d229678bb40494a2847078737cf4eaedc92bea3ed8db1b3ff8358fa3a460d32cbd84be9fb1222bf908fa4a8a282979f57b139739fe2f7eb3076368b98cd36918b3fbcfd8228c73a81426cb320e33f91b2bedf54bf892032d6645ff706fef22cc58be4d6630ac64c926558b609dcecb980ffa75597fc44efb9b309f85f126e3b35511145998e47158f0fed9f0900095593c0d01fc84f5816e04bf6e1fc00016d172b028e14194266c707f55149bf7597a11cd793662f76b78d5b321fbb2c7e0a3550ce67c11967191079ff36cf1ff7908cfde866beaf4bff68f4e3ebcdeff989ef3043adfd1f6284dcf235eb5d55a8aa6164201d0eea4088b68f61a262b7f9362e70381247e80308be8f333d68f818cfbfd515d90970b5110fc9aa7499f9e5f01d1f07f9d444596c63100edbfbae04971546431105ea1593e4b3730b134ac9a3ef43088c3bca056309ca48c6341009c172c39fe011e1fc8a1d1ac97b319cff3d7093c6f3a98874558c1c50f70f0df573c6127358fe0cc86192c8dcb15108158384ee1f90610c7721844c20534581a51a282da64e912dae7d44a3238838a790a93b001522fd26c8d8bae28b32467212ce50358ad5132a38e54502b9af99cadc21c961460b880c5b082357819152b822fa088450a7086235194a40c0719a8c03ee2a206d68d80bbe32d5b739878b162119032a2ba37940bc588440b5581762ac04ba897a4050b6745492081da30ee451937fd460b36b867d21b3f3ccbd2ec7522e6e2502b12636a9e5dedd55f2517dce7eba818f43f1dbf4b603a787f78b8a7f52879e1053b30bb25aac004bc0a672b6599726429b32e7e802c790a322b4e97831ed5ea8d18fd0da279f5add822bb8aef8ef158885bad8c0657caefab436bf4ea1ac0ee4e6950314f9630f3fbecd159d3ba5e146653c05e010cd3fc315af3b42c149a98e4a0e5182c7931a844e043d61f13fef977c4be933e3c125d0eb5a6815c87837a3d1ae5c40d03c913eae847eccfc0d5e2c195b2b065d5d6656d31cb626171cbed471e47007ef2a87f77237e74600df99a18b4f56ef5dc229f6b81d82ea355bd06dfe3741662ad8a8c385fa0352e7e8062219faba730a0773fc223d4eecdd324bc8896002159bebc0cb738c5a8d89bf29416bdfd5c0a6da1e36599aa3b66e97a1373c27fc2be5c1dea65a8b87dcf8f13a4848668532ec5666e37261ae3f3d333ed39d81d3cb6abafb7b454fb7ded6902951d3040cb14e92c8d8f56a086412368d4907532be49b302c81eda9d89b2f7302d11bff4b6760c0acccae4150ecc46b5dc2c335058c7c92275b4039ba202e7e6e987bd31da14bd61cdbe0dbf61416ee8ecd791544c8b28cb0b8655ca70c92b9b338ee0e146583564b5e243306eb27e5ea965151a69c208f5b1b070d00e0e1ba0971cf4e20567e14518c5e114540228546a31623d9ef4545039ca66d96165005c46606fafc362b6a2ea0ce8077ff73f9d803e114646ef9fabfd8f7fef514d159a68044cbfadaba04646cd8bbf8fdef682469e094b28598e4433580b8d6801b5c7065821a255087f9e53dd5cea0e78f2f0a129fbb00254a77aa7d199aea884ae05a12195cf73f6d8a344c9ac37b49cf6ab4217faba08e368fe8610037fa10041d4f001b0641e01f5b1d8d515d9395ca02b0d8966f2c72821c6a20c8d19312953e29838bd54f841013703ce0cd8dfd1425a6fc20c6cb454da83d0000b19f8453922478e13af59c6090cedb49a95c0bce4b1622c551f7590400ff56750a46fb0e323e87830b45ae28468d5e5c4bc60ca34b9e8861f694b6aed6189f1cfef1634cb4336a9a5b736918ca3e3d50a345681e993e801eab588aa71561c538f71c21eb986d6e826746dea66a707670e3bcdb43d7554ae34f1031c340d67e7880c2c46625e02cee77b9ebe71e5579a7d28a5e0e012c8925e0e8329fc1df4a71c96292f9318fc2e45e36a3689a5201bb57435d475de7d68daab35b250162742baf6547dae82af64089a8d554b10fb610626f330c09243c3dab6d7a23170aa7268d0d1c435e17cfeb2d1a575ed7eb6ee835bf9038f156f131ecea34c3e07db2fca866a29da3358887a5b7d5ea4e56c85059f3673f4ea45d19589c6f1cc8344c6d7e90577e261175548c0f4caf9742002e632cfa2fcbc46c59cbec6cd51278c6c3ff0cd328df4381dd23cfae61b76afb188ccf969f1b154974773b1eab915b8450998d5cae3da2c6bb851f4645b6535a441ffff24bcb84cb3733229fa43b48dc278d05f81d2d6fa849a0da4f67af9aa2c90e4ee5aae15a23807dd686cacc0af5fd93d31fc5bd0b9f14e2c8a1a6423a7da3fb75eaaee5c81440b0cfe7069567620074a8bb93031a184fc5f1d53d5e815ae2a5a966716d6ee6a643772e9e982f6eb34843720b5e263d4366299df7a1c601102bd571f00a3418d9bea47823e105d31c5cb40d4cb9cec2eb43684254f76269800f98a8c090cca20308adb04e61a231b5ca5c65b84e1086020eca385639913de47354e55450274fcc388a9a3a929dbb6543e80982bf81f415cff20a8168ec4c6df89330ef6872897ce5a278c810b39cca6ede69d560308a2f9998524f6840b281fecc2e7e81ac8d082df818a673df9aa6bcaadee27996ef267ec606495a465e12b3a4ebedf163cff981661ecacf0ae2c76d478399f63c4f459cd1c41084ff47a5787eee1554cb17b74ff5d08041e1d1c7841b70895230a05503cdc3167e67469f183e0dd866620f8f4e125d85e9b021df6891d9d042972bc001f151d4ee1a0a3daace3b109071901be6458c14840b2ccf90cb5c47c64420219731982230afe4a989fd7de2ffe5e87e7e07eb0d92a8d66e0dc7c5f92449aa749bfa036262868322d970862cde6658648a1f68fc2180368e566c4f294641a2f102ced399040b300011245b4e695af243cf78b288f8a40c4e0c516928000a2718331681ba12a244db0a0da3a25591a26b8ed94b115fc039efc321d215672f4268cdf4ad0a068daee692528aa08ad9f112b543ce9ac5c63c8546085c2260e677c301e7cf70cfefbc7d7e0c1e12ff98361d3087efd32817f06a7ff383c7b300c1edc1f7efd07fc3b1eb1defd473d872f73af69ec72610c1400a95ed360d2630f19c6d640225e8221ff90f50ed7e1e77d60222a7a72f0e0f1b70f9e3c3d30bc2cafdb86083d5448f05c85beLine truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["app.js"] = bs

gui/app.js

@@ -737,10 +737,16 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
             $scope.currentRepo.FileVersioningSelector = "none";
         }
         $scope.currentRepo.simpleKeep = $scope.currentRepo.simpleKeep || 5;
-        $scope.currentRepo.staggeredMaxAge = $scope.currentRepo.staggeredMaxAge || 365;
         $scope.currentRepo.staggeredCleanInterval = $scope.currentRepo.staggeredCleanInterval || 3600;
         $scope.currentRepo.staggeredVersionsPath = $scope.currentRepo.staggeredVersionsPath || "";
 
+        // staggeredMaxAge can validly be zero, which we should not replace
+        // with the default value of 365. So only set the default if it's
+        // actually undefined.
+        if (typeof $scope.currentRepo.staggeredMaxAge === 'undefined') {
+            $scope.currentRepo.staggeredMaxAge = 365;
+        }
+
         $scope.editingExisting = true;
         $scope.repoEditor.$setPristine();
         $('#editRepo').modal();