From 77d3e10bce85b2d6398e623e335f8d2962b408bd Mon Sep 17 00:00:00 2001 From: John Crisp Date: Thu, 1 May 2025 12:38:55 +0200 Subject: [PATCH] fix user add and update group files --- .../templates/partials/_grp_add.html.ep | 125 ++++++++++-------- .../templates/partials/_grp_del.html.ep | 110 ++++++++------- .../templates/partials/_grp_upd.html.ep | 123 +++++++++-------- .../templates/partials/_usr_list.html.ep | 2 + .../templates/partials/_usr_upd.html.ep | 9 +- .../AdminLTE/templates/useraccounts.html.ep | 1 - smeserver-manager-AdminLTE.spec | 7 +- 7 files changed, 213 insertions(+), 164 deletions(-) diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep index 3e90c99..572926a 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_add.html.ep @@ -1,62 +1,83 @@ -
+
+
+ - % my $btn = l('ADD'); - - %= form_for '/groups2' => (method => 'POST') => begin -

- %=l 'CREATE_GROUP' -

-

- %=l 'grp_GROUP_NAMING' -

- -

- - %=l 'GROUP_NAME', class => "" - - - %= text_field 'groupName', class => "" - -

- -

- %=l 'grp_GROUP_DESC_EXPL' -

- - %=l 'grp_GROUP_DESC', class => "" - - - %= text_field 'groupDesc', class => "" - -

- -

- - %=l 'GROUP_MEMBERS', class => "" - +

<%= l 'CREATE_GROUP' %>


- - %= check_box 'groupMembers' => 'admin' - Administrator (admin) + <%= l 'grp_GROUP_NAMING' %> +

+ + % my $btn = l('ADD'); + +
+ +
+
+ +
+
+ +
+
+ + Group + +
+
+ + + +

+ + <%= l 'grp_GROUP_DESC_EXPL' %> + +

+ +
+
+ +
+
+ +
+
+ + Group Alias + +
+
+ +
+ +
+ <%= l 'GROUP_MEMBERS' %> +
+
- % my $users = $c->gen_users_list(); - % foreach my $key ( sort keys %$users ) - % { - %= check_box 'groupMembers' => $key - %=$users->{$key} - %= "(" . $key . ")" +
+ %= check_box 'groupMembers' => 'admin' +  Administrator (admin) +
+ % my $users = $c->gen_users_list(); + % foreach my $key ( sort keys %$users ) { + %= check_box 'groupMembers' => $key +   + %= $users->{$key} + %= "(" . $key . ")"
- % } - -

- -

+ % } +

+

- %= submit_button "$btn", class => "" -

+ +
+
+ +
+
%= hidden_field 'trt' => $grp_datas->{trt} - % end + %# end
diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep index 6382e9b..db6e8bc 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_del.html.ep @@ -1,63 +1,71 @@ -
+
- % my $btn = l('REMOVE'); - %= form_for '/groups2' => (method => 'POST') => begin -

- %=l 'REMOVE_USER_GROUP' -

+ % my $btn = l('REMOVE'); -

- %=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) -

+ +

+ +

<%=l 'REMOVE_USER_GROUP' %>

+ +
+ + <%=l('grp_DELETE_DESCRIPTION', $grp_datas->{group}) %> + +

+ +
+ + % my $size = keys %$members; + % if ( ! $size ){ + %= l 'ACCOUNT_GROUP_NONE' + % } else { + %= l 'grp_GROUP_HAS_MEMBERS' + +

-

- % my $size = keys %$members; - % if ( ! $size ){ - %=l 'ACCOUNT_GROUP_NONE' - % } else { - %=l 'grp_GROUP_HAS_MEMBERS' -

    - % foreach my $key ( keys %$members) - % { -
  • - %=$key - ( - %=$members->{$key} - ) -
    • - % } -
- % } -

+ % foreach my $key ( keys %$members) { +
  • + %=$key + ( <%=$members->{$key} %> ) +
    • + % } + + % } -

    - % $size = keys %$ibays; - % if ( $size ) { - %=l 'grp_IBAYS_WILL_BE_CHANGED' +

    + +

    + +
    + + % $size = keys %$ibays; + + % if ( $size ) { + %=l 'grp_IBAYS_WILL_BE_CHANGED'
      - % foreach my $key (sort ( keys %$ibays )) - % { -
    • - %=$key - ( - %=$ibays->{$key} - ) -
      • - % } -
    - % } -

    + % foreach my $key (sort ( keys %$ibays )) { +
  • + %=$key + ( + %=$ibays->{$key} + ) +
    • + % } + + % } +
    -

    -
    - %= submit_button "$btn", class => "" -

    +
    +
    + +
    +
    - %= hidden_field 'trt' => $grp_datas->{trt} - %= hidden_field 'groupName' => $grp_datas->{group} + %= hidden_field 'trt' => $grp_datas->{trt} + %= hidden_field 'groupName' => $grp_datas->{group} - % end +
    diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep index c1ada15..f2156cb 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_upd.html.ep @@ -1,71 +1,90 @@
    - % my $btn = l('SAVE'); + % my $btn = l('SAVE'); - %= form_for '/groups2' => (method => 'POST') => begin - -

    - %=l 'MODIFY_USER_GROUP' -


    - -

    - - %=l 'GROUP_NAME', class => "" - - - %= $grp_datas->{group}, class => "" - -

    - -

    - %=l 'grp_GROUP_DESC_EXPL' + +

    - - %=l 'grp_GROUP_DESC', class => "" - - - % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc'; - %= text_field 'groupDesc', class => "" - -

    + +

    <%= l 'MODIFY_USER_GROUP' %>

    + +

    + +
    +
    + +
    +
    + +
    +
    + +

    + + <%=l 'grp_GROUP_DESC_EXPL'%> + +

    + + % param 'groupDesc' => $grp_datas->{description} unless param 'groupDesc'; + +
    +
    + +
    +
    + +
    +
    + + Group Alias + +
    +
    + +

    + +
    + <%=l 'GROUP_MEMBERS' %> +
    -

    - - %=l 'GROUP_MEMBERS', class => "" -
    - + +

    % if ( $members->{'admin'} ) { %= check_box 'groupMembers', value => 'admin', checked => undef - %} else { + % } else { %= check_box 'groupMembers' => 'admin' - %} - Administrator (admin) + % } +  Administrator (admin) +
    +
    - % my $users = $c->gen_users_list(); - % foreach my $key ( sort keys %$users ) - % { + % my $users = $c->gen_users_list(); + % foreach my $key ( sort keys %$users ) { % if ( $members->{ $key } ) { - - - %} else { - %= check_box 'groupMembers' => $key - %} - %=$users->{$key} . " (" . $key . ")" -
    - % } - -

    + + % } else { + %= check_box 'groupMembers' => $key +   + % } + %= $users->{$key} + %= " (" . $key . ")" +
    + % } -



    - %= submit_button "$btn", class => "" -

    + +
    +
    + +
    +
    + %= hidden_field 'trt' => $grp_datas->{trt} - %= hidden_field 'groupName' => $grp_datas->{group} + %= hidden_field 'groupName' => $grp_datas->{group} - % end +
    diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep index f58108e..d0b1e95 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_list.html.ep @@ -24,6 +24,7 @@ % if ($numUsers == 0){ %=l 'usr_NO_USER_ACCOUNTS' % } else { +
    @@ -158,6 +159,7 @@ % }
    +
    <%} %> diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep index f95504f..17dbefb 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_usr_upd.html.ep @@ -1,4 +1,3 @@ -% content_for 'module' => begin

    @@ -18,10 +17,10 @@
    - +
    - +
    @@ -30,8 +29,6 @@
    - %#= text_field 'user' - % } else { % $btn = l('SAVE'); @@ -250,7 +247,6 @@ <%= l 'usr_MEMBER' %> <%=l 'GROUP' %> <%=l 'DESCRIPTION' %> - @@ -296,7 +292,6 @@ %= hidden_field 'user' => $usr_datas->{user} % } - % end
    diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep index 216a6c8..01d096d 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/useraccounts.html.ep @@ -15,7 +15,6 @@ %= dumper $usr_datas

    % } -

    <%= $title%>

    diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index cfc84ae..14c0359 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,6 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 15 +%define release 16 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -26,8 +26,13 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Thu May 01 2025 John Crisp 11.0.0-16.sme +- Fix user add error +- Update group templates + * Fri Apr 25 2025 John Crisp 11.0.0-15.sme - Forgot the updated CSS + * Fri Apr 25 2025 John Crisp 11.0.0-14.sme - Finish user templates. Saving fixed. Start on groups