View | Details | Raw Unified | Return to bug 13632
Collapse All | Expand All

(-)a/C4/Auth.pm (-2 / +2 lines)
Lines 1902-1915 of the subpermission. Link Here
1902
1902
1903
sub get_all_subpermissions {
1903
sub get_all_subpermissions {
1904
    my $dbh = C4::Context->dbh;
1904
    my $dbh = C4::Context->dbh;
1905
    my $sth = $dbh->prepare( "SELECT flag, code, description
1905
    my $sth = $dbh->prepare( "SELECT flag, code
1906
                             FROM permissions
1906
                             FROM permissions
1907
                             JOIN userflags ON (module_bit = bit)" );
1907
                             JOIN userflags ON (module_bit = bit)" );
1908
    $sth->execute();
1908
    $sth->execute();
1909
1909
1910
    my $all_perms = {};
1910
    my $all_perms = {};
1911
    while ( my $perm = $sth->fetchrow_hashref ) {
1911
    while ( my $perm = $sth->fetchrow_hashref ) {
1912
        $all_perms->{ $perm->{'flag'} }->{ $perm->{'code'} } = $perm->{'description'};
1912
        $all_perms->{ $perm->{'flag'} }->{ $perm->{'code'} } = 1;
1913
    }
1913
    }
1914
    return $all_perms;
1914
    return $all_perms;
1915
}
1915
}
(-)a/members/member-flags.pl (-7 / +3 lines)
Lines 89-98 if ($input->param('newflags')) { Link Here
89
    my $dbh=C4::Context->dbh();
89
    my $dbh=C4::Context->dbh();
90
    my $all_perms  = get_all_subpermissions();
90
    my $all_perms  = get_all_subpermissions();
91
    my $user_perms = get_user_subpermissions($bor->{'userid'});
91
    my $user_perms = get_user_subpermissions($bor->{'userid'});
92
    my $sth=$dbh->prepare("SELECT bit,flag,flagdesc FROM userflags ORDER BY bit");
92
    my $sth=$dbh->prepare("SELECT bit, flag FROM userflags ORDER BY bit");
93
    $sth->execute;
93
    $sth->execute;
94
    my @loop;
94
    my @loop;
95
    while (my ($bit, $flag, $flagdesc) = $sth->fetchrow) {
95
    while (my ($bit, $flag) = $sth->fetchrow) {
96
	    my $checked='';
96
	    my $checked='';
97
	    if ($accessflags->{$flag}) {
97
	    if ($accessflags->{$flag}) {
98
	        $checked= 1;
98
	        $checked= 1;
Lines 101-107 if ($input->param('newflags')) { Link Here
101
	    my %row = ( bit => $bit,
101
	    my %row = ( bit => $bit,
102
		    flag => $flag,
102
		    flag => $flag,
103
		    checked => $checked,
103
		    checked => $checked,
104
		    flagdesc => $flagdesc );
104
        );
105
105
106
        my @sub_perm_loop = ();
106
        my @sub_perm_loop = ();
107
        my $expand_parent = 0;
107
        my $expand_parent = 0;
Lines 113-119 if ($input->param('newflags')) { Link Here
113
                        id => "${flag}_$sub_perm",
113
                        id => "${flag}_$sub_perm",
114
                        perm => "$flag:$sub_perm",
114
                        perm => "$flag:$sub_perm",
115
                        code => $sub_perm,
115
                        code => $sub_perm,
116
                        description => $all_perms->{$flag}->{$sub_perm},
117
                        checked => 1
116
                        checked => 1
118
                    };
117
                    };
119
                }
118
                }
Lines 127-133 if ($input->param('newflags')) { Link Here
127
                        id => "${flag}_$sub_perm",
126
                        id => "${flag}_$sub_perm",
128
                        perm => "$flag:$sub_perm",
127
                        perm => "$flag:$sub_perm",
129
                        code => $sub_perm,
128
                        code => $sub_perm,
130
                        description => $all_perms->{$flag}->{$sub_perm},
131
                        checked => 1
129
                        checked => 1
132
                    };
130
                    };
133
                }
131
                }
Lines 139-145 if ($input->param('newflags')) { Link Here
139
                        id => "${flag}_$sub_perm",
137
                        id => "${flag}_$sub_perm",
140
                        perm => "$flag:$sub_perm",
138
                        perm => "$flag:$sub_perm",
141
                        code => $sub_perm,
139
                        code => $sub_perm,
142
                        description => $all_perms->{$flag}->{$sub_perm},
143
                        checked => 0
140
                        checked => 0
144
                    } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm};
141
                    } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm};
145
                }
142
                }
146
- 

Return to bug 13632