Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Post create team redirection and changed internal name as machine name #885

Merged
merged 4 commits into from
Jul 17, 2023
Merged

Post create team redirection and changed internal name as machine name #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae34b9e
Post create team redirection and changed internal name as machine name
shishir-intelli Jul 11, 2023
4d34b00
Merge branch '2.x' into nitpick_internal_name
shishir-intelli Jul 13, 2023
78c5664
Merge branch '2.x' into nitpick_internal_name
shishir-intelli Jul 14, 2023
85ff6b6
Merge branch '2.x' into nitpick_internal_name
shishir-intelli Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions modules/apigee_edge_teams/src/Entity/Form/TeamForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ public function form(array $form, FormStateInterface $form_state) {
$team = $this->entity;

$form['name'] = [
'#title' => $this->t('Internal name'),
'#title' => $this->t('Machine name'),
'#type' => 'machine_name',
'#machine_name' => [
'source' => ['displayName', 'widget', 0, 'value'],
'label' => $this->t('Internal name'),
'label' => $this->t('Machine name'),
'exists' => [$this, 'exists'],
],
'#field_prefix' => $team->isNew() ? $this->team_prefix : "",
Expand Down Expand Up @@ -308,7 +308,8 @@ public function save(array $form, FormStateInterface $form_state) {
}

}
$form_state->setRedirectUrl($team->toUrl('collection'));
// Redirecting user to team view page to manage the team members and apps.
$form_state->setRedirectUrl($team->toUrl('canonical'));

return $result;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Entity/Form/AppForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ public function form(array $form, FormStateInterface $form_state) {
'#type' => 'machine_name',
'#machine_name' => [
'source' => ['displayName', 'widget', 0, 'value'],
'label' => $this->t('Internal name'),
'label' => $this->t('Machine name'),
'exists' => [$this, 'appExists'],
],
'#title' => $this->t('Internal name'),
'#title' => $this->t('Machine name'),
// It should/can not be changed if app is not new.
'#disabled' => !$app->isNew(),
'#default_value' => $app->getName(),
Expand Down