Allow updating to the specified version from WebUI

owncloud · Nov 12, 2018 · 79d1a44 · 79d1a44
1 parent bdc20ce
commit 79d1a44
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/lib/Controller/MarketController.php b/lib/Controller/MarketController.php
@@ -202,15 +202,17 @@ public function uninstall($appId) {
 	 * @return array | DataResponse
 	 */
 	public function update($appId) {
+		$targetVersion = $this->request->getParam('toVersion');
 		try {
-			$this->marketService->updateApp($appId);
+			$this->marketService->updateApp($appId, $targetVersion);
 			return [
 				'message' => $this->l10n->t('App %s updated successfully', $appId)
 			];
 		} catch(\Exception $ex) {
-			return new DataResponse([
-				'message' => $ex->getMessage()
-			], Http::STATUS_BAD_REQUEST);
+			return new DataResponse(
+				['message' => $ex->getMessage()],
+				Http::STATUS_BAD_REQUEST
+			);
 		}
 	}
 

diff --git a/src/components/Details.vue b/src/components/Details.vue
@@ -112,7 +112,7 @@
 		data () {
 			return {
 				// Key of releases array
-				// if length exeeds 1
+				// if length exceeds 1
 				updateVersion : 0
 			}
 		},
@@ -202,7 +202,11 @@
 				});
 			},
 			update () {
-				this.$store.dispatch('PROCESS_APPLICATION', [this.application.id, 'update'])
+				if (this.releases.length > 1) {
+					this.$store.dispatch('PROCESS_APPLICATION', [this.application.id, 'update', {'version' : this.releases[this.updateVersion].version}]);
+				} else {
+					this.$store.dispatch('PROCESS_APPLICATION', [this.application.id, 'update']);
+				}
 			},
 			setUpdateVersion (version) {
 				UIkit.dropdown('._multiupdate-uikit-element').hide();

diff --git a/src/components/UpdateList.vue b/src/components/UpdateList.vue
@@ -54,7 +54,7 @@
 		},
 		methods: {
 			update (id, version) {
-				this.$store.dispatch('PROCESS_APPLICATION', [id, 'update'])
+				this.$store.dispatch('PROCESS_APPLICATION', [id, 'update', {'version' : version}])
 			},
 			processing(id) {
 				return _.contains(this.$store.state.processing, id)

diff --git a/src/store.js b/src/store.js
@@ -236,8 +236,10 @@ const actions = {
 
         context.commit("START_PROCESSING", id);
 
+        let data = (options.version) ? {'toVersion' : options.version} : {};
+
         return Axios.post(OC.generateUrl("/apps/market/apps/{id}/" + route, {id}),
-            {}, {
+            data, {
                 headers: {
                     requesttoken: OC.requestToken
                 }