diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 21:03:48 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 21:03:48 +0100 |
| commit | f04aa92778dca7f71ca656235885095b13dd3535 (patch) | |
| tree | b0ac9cf3dfecbbdb0209c1204054adcac861f001 /app/views/user_groups | |
| parent | f3c3e77eaa2b82567f02601b6f66177208674181 (diff) | |
| parent | 508871c01cbf02bf6d8d7056c2d5a70e4d67eebf (diff) | |
Merge branch 'develop'5.0.2
Diffstat (limited to 'app/views/user_groups')
| -rw-r--r-- | app/views/user_groups/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/user_groups/_form_core.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/user_groups/_form.html.haml b/app/views/user_groups/_form.html.haml index cbe3cc4..3263fdd 100644 --- a/app/views/user_groups/_form.html.haml +++ b/app/views/user_groups/_form.html.haml @@ -1,4 +1,4 @@ -= simple_form_for(@user_group) do |f| += simple_form_for([@parent, @user_group]) do |f| = f.error_notification = render "form_core", :f => f diff --git a/app/views/user_groups/_form_core.html.haml b/app/views/user_groups/_form_core.html.haml index a45ba6f..edb0dbc 100644 --- a/app/views/user_groups/_form_core.html.haml +++ b/app/views/user_groups/_form_core.html.haml @@ -1,3 +1,3 @@ .inputs - = f.input :name, :label => t('user_groups.form.name.label'), :hint => conditional_hint('user_groups.form.name.hint') + = f.input :name, :label => t('user_groups.form.name.label'), :hint => conditional_hint('user_groups.form.name.hint'), :autofocus => true = f.input :description, :label => t('user_groups.form.description.label'), :hint => conditional_hint('user_groups.form.description.hint') |