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

make username mandatory when profile locked

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-01-13 15:20:29 -08:00
parent 2085a4a7d4
commit 9109c89d8f
7 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/js/setupaccount.js
View File

@@ -38,24 +38,24 @@ app.config(['$translateProvider', function ($translateProvider) {
// If we find out how to get that function handle somehow dynamically we can use that, otherwise the copy is required
function translateFilterFactory($parse, $translate) {
'use strict';
'use strict';
var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) {
if (!angular.isObject(interpolateParams)) {
var ctx = this || {
'__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f'
};
interpolateParams = $parse(interpolateParams)(ctx);
var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) {
if (!angular.isObject(interpolateParams)) {
var ctx = this || {
'__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f'
};
interpolateParams = $parse(interpolateParams)(ctx);
}
return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
};
if ($translate.statefulFilter()) {
translateFilter.$stateful = true;
}
return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
};
if ($translate.statefulFilter()) {
translateFilter.$stateful = true;
}
return translateFilter;
return translateFilter;
}
translateFilterFactory.displayName = 'translateFilterFactory';
app.filter('tr', translateFilterFactory);
@@ -89,7 +89,7 @@ app.controller('SetupAccountController', ['$scope', '$translate', '$http', funct
};
if (!$scope.profileLocked) {
data.username = $scope.username;
if (!$scope.existingUsername) data.username = $scope.username;
data.displayName = $scope.displayName;
}
@@ -129,15 +129,20 @@ app.controller('SetupAccountController', ['$scope', '$translate', '$http', funct
}).error(error);
};
$http.get(API_ORIGIN + '/api/v1/cloudron/status').success(function (data, status) {
if (!$scope.existingUsername && $scope.profileLocked) {
$scope.view = 'noUsername';
$scope.initialized = true;
} else {
$http.get(API_ORIGIN + '/api/v1/cloudron/status').success(function (data, status) {
$scope.initialized = true;
if (status !== 200) return;
if (status !== 200) return;
if (data.language) $translate.use(data.language);
if (data.language) $translate.use(data.language);
$scope.status = data;
}).error(function () {
$scope.initialized = false;
});
$scope.status = data;
}).error(function () {
$scope.initialized = false;
});
}
}]);