jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove isDev flag

Browse Source 
We can pretty much test everything here on self-hosted cloudrons now
This commit is contained in:
Girish Ramakrishnan
2017-04-13 11:24:57 -07:00
parent f6a2406091
commit cdb5dc2c53
8 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webadmin/src/js/client.js
View File

@@ -110,7 +110,6 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
ip: null,
revision: null,
update: { box: null, apps: null },
isDev: false,
progress: {},
isCustomDomain: false,
region: null,

2
webadmin/src/views/appstore.html
View File

@@ -140,7 +140,7 @@
<button type="button" class="btn btn-default" ng-show="appInstall.state !== 'postInstall'" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-default" ng-show="appInstall.state === 'postInstall'" data-dismiss="modal" ng-click="appInstall.switchToAppsView()">Got it</button>
<button type="button" class="btn btn-success" ng-show="config.provider === 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="showView('/settings')">Upgrade Cloudron</button>
<button type="button" class="btn btn-danger" ng-show="(config.isDev || config.provider !== 'caas') && user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
<button type="button" class="btn btn-danger" ng-show="config.provider !== 'caas' && user.admin && appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
<button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo' && user.admin" ng-click="appInstall.showForm()">Install</button>
<button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm' && user.admin" ng-click="appInstall.submit()" ng-disabled="appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="appInstall.busy"></i> Install</button>
</div>

8
webadmin/src/views/settings.html
View File

@@ -354,7 +354,7 @@
</div>
<div class="card" style="margin-bottom: 15px;">
<div class="row" ng-show="backupConfig.provider !== 'caas' || config.isDev">
<div class="row" ng-show="backupConfig.provider !== 'caas'">
<div class="col-xs-6">
<span class="text-muted">Provider</span>
</div>
@@ -362,7 +362,7 @@
<span>{{ backupConfig.provider === 'caas' ? 'cloudron.io' : backupConfig.provider }}</span>
</div>
</div>
<div class="row" ng-show="backupConfig.provider !== 'caas' || config.isDev">
<div class="row" ng-show="backupConfig.provider !== 'caas'">
<div class="col-xs-6">
<span class="text-muted">Location</span>
</div>
@@ -384,7 +384,7 @@
</div>
</div>
<div class="row" ng-show="backupConfig.provider !== 'caas' || config.isDev">
<div class="row" ng-show="backupConfig.provider !== 'caas'">
<br/>
<div class="col-md-12">
<div ng-show="createBackup.busy" class="progress progress-striped active animateMe">
@@ -393,7 +393,7 @@
<br/>
</div>
</div>
<div class="row" ng-show="backupConfig.provider !== 'caas' || config.isDev">
<div class="row" ng-show="backupConfig.provider !== 'caas'">
<div class="col-md-6">
<p ng-show="createBackup.busy">{{ createBackup.message }}</p>
</div>