Commit 059ebe8e authored by antrim@chromium.org's avatar antrim@chromium.org

Add string for case when supervised user creation is disabled due to "only...

Add string for case when supervised user creation is disabled due to "only these users can log in" resitrictions.

BUG=263610
TEST=manually

Review URL: https://chromiumcodereview.appspot.com/22856002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217050 0039d316-1c4b-4281-b951-d872f2087c98
parent 2c4cf5e0
...@@ -471,6 +471,9 @@ Press any key to continue exploring. ...@@ -471,6 +471,9 @@ Press any key to continue exploring.
<message name="IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT" desc="Text shown when supervised user can be created, but no users that can be manager exist."> <message name="IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT" desc="Text shown when supervised user can be created, but no users that can be manager exist.">
At least one account must exist on this device before creating a supervised user. At least one account must exist on this device before creating a supervised user.
</message> </message>
<message name="IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT" desc="Text shown when supervised user can be created, but owner of the device restricted managed user creation or whitelist has been enabled for this device.">
Creation of supervised users is restricted by the owner of this device.
</message>
<message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_TITLE" desc="Supervised user dialog, intro page, title"> <message name="IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_TITLE" desc="Supervised user dialog, intro page, title">
What is a supervised user? What is a supervised user?
</message> </message>
......
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
<span i18n-content="createManagedUserFeatureName"></span> <span i18n-content="createManagedUserFeatureName"></span>
</div> </div>
<div id="createManagedUserLinkPlaceholder"></div> <div id="createManagedUserLinkPlaceholder"></div>
<div id="createManagedUserNoManagerText" <div id="createManagedUserNoManagerText" hidden></div>
i18n-content="createManagedUserNoManagerText" hidden></div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -269,6 +269,8 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() { ...@@ -269,6 +269,8 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
$('createManagedUserLinkPlaceholder').hidden = $('createManagedUserLinkPlaceholder').hidden =
!data.managedUsersCanCreate; !data.managedUsersCanCreate;
$('createManagedUserNoManagerText').hidden = data.managedUsersCanCreate; $('createManagedUserNoManagerText').hidden = data.managedUsersCanCreate;
$('createManagedUserNoManagerText').textContent =
data.managedUsersRestrictionReason;
// Allow cancellation of screen only when user pods can be displayed. // Allow cancellation of screen only when user pods can be displayed.
this.cancelAllowed_ = data.isShowUsers && $('pod-row').pods.length; this.cancelAllowed_ = data.isShowUsers && $('pod-row').pods.length;
......
...@@ -456,8 +456,6 @@ void SigninScreenHandler::DeclareLocalizedValues( ...@@ -456,8 +456,6 @@ void SigninScreenHandler::DeclareLocalizedValues(
IDS_CREATE_LOCALLY_MANAGED_USER_HTML); IDS_CREATE_LOCALLY_MANAGED_USER_HTML);
builder->Add("createManagedUserFeatureName", builder->Add("createManagedUserFeatureName",
IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME); IDS_CREATE_LOCALLY_MANAGED_USER_FEATURE_NAME);
builder->Add("createManagedUserNoManagerText",
IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT);
builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML); builder->Add("offlineLogin", IDS_OFFLINE_LOGIN_HTML);
builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER); builder->Add("ownerUserPattern", IDS_LOGIN_POD_OWNER_USER);
builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER); builder->Add("removeUser", IDS_LOGIN_POD_REMOVE_USER);
...@@ -1098,13 +1096,23 @@ void SigninScreenHandler::UpdateAuthParams(DictionaryValue* params) { ...@@ -1098,13 +1096,23 @@ void SigninScreenHandler::UpdateAuthParams(DictionaryValue* params) {
bool managed_users_allowed = bool managed_users_allowed =
UserManager::Get()->AreLocallyManagedUsersAllowed(); UserManager::Get()->AreLocallyManagedUsersAllowed();
bool managed_users_can_create = false; bool managed_users_can_create = true;
if (managed_users_allowed) { int message_id = -1;
managed_users_can_create = if (delegate_->GetUsers().size() == 0) {
(delegate_->GetUsers().size() > 0) && allow_new_user; managed_users_can_create = false;
message_id = IDS_CREATE_LOCALLY_MANAGED_USER_NO_MANAGER_TEXT;
} }
if (!allow_new_user) {
managed_users_can_create = false;
message_id = IDS_CREATE_LOCALLY_MANAGED_USER_CREATION_RESTRICTED_TEXT;
}
params->SetBoolean("managedUsersEnabled", managed_users_allowed); params->SetBoolean("managedUsersEnabled", managed_users_allowed);
params->SetBoolean("managedUsersCanCreate", managed_users_can_create); params->SetBoolean("managedUsersCanCreate", managed_users_can_create);
if (!managed_users_can_create) {
params->SetString("managedUsersRestrictionReason",
l10n_util::GetStringUTF16(message_id));
}
} }
void SigninScreenHandler::LoadAuthExtension( void SigninScreenHandler::LoadAuthExtension(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment