diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-07 18:51:00 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-07 18:51:00 +0300 |
| commit | 46107f82d427b6a102f323d637242872303421ef (patch) | |
| tree | 846cd240bfdcf54f496e129c999b8b5159eedb04 /settings | |
| parent | 5b22ee4c05c26f977794daed05364331d8eb4987 (diff) | |
| parent | ae285c065448a6e45d6e1e542da87ea0a692cbee (diff) | |
Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning
Issue 20218 min max owncloud version warning
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/controller/appsettingscontroller.php | 3 | ||||
| -rw-r--r-- | settings/templates/apps.php | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index 765fe2d2850..79b7589027b 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -296,6 +296,9 @@ class AppSettingsController extends Controller { $app['canInstall'] = empty($missing); $app['missingDependencies'] = $missing; + $app['missingMinOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['min-version']); + $app['missingMaxOwnCloudVersion'] = !isset($app['dependencies']['owncloud']['@attributes']['max-version']); + return $app; }, $apps); diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 7213d552c08..94efd76c7c2 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -97,6 +97,18 @@ script( <div class="app-description-toggle-show"><?php p($l->t("Show description …"));?></div> <div class="app-description-toggle-hide hidden"><?php p($l->t("Hide description …"));?></div> + {{#if missingMinOwnCloudVersion}} + <div class="app-dependencies"> + <p><?php p($l->t('This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p> + </div> + {{else}} + {{#if missingMaxOwnCloudVersion}} + <div class="app-dependencies"> + <p><?php p($l->t('This app has no maximum ownCloud version assigned. This will be an error in ownCloud 11 and later.')); ?></p> + </div> + {{/if}} + {{/if}} + {{#unless canInstall}} <div class="app-dependencies"> <p><?php p($l->t('This app cannot be installed because the following dependencies are not fulfilled:')); ?></p> |