X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fauth_subfields_structure.pl;h=321e54c1ac68af31e2de0254a7dbf86759071f09;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=fd86778fabef1b128bb241649fc6f5c180712da3;hpb=f18df06e5d2105794854a646e18b2fbef4ece3bc;p=koha_fer

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index fd86778fab..321e54c1ac 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -13,11 +13,12 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Output;
 use C4::Auth;
 use CGI;
@@ -56,7 +57,7 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { parameters => 1 },
+        flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
 );
@@ -138,58 +139,35 @@ if ($op eq 'add_form') {
 	while ($data =$sth->fetchrow_hashref) {
 
 		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-                                        -values =>
-                                        [ '-1', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10' ],
-                                        -labels => {
-                                            '-1' => 'ignore',
-                                            '0'  => '0',
-                                            '1'  => '1',
-                                            '2'  => '2',
-                                            '3'  => '3',
-                                            '4'  => '4',
-                                            '5'  => '5',
-                                            '6'  => '6',
-                                            '7'  => '7',
-                                            '8'  => '8',
-                                            '9'  => '9',
-                                        },
-					-default=>$data->{'tab'},
-					-size=>1,
-		 			-tabindex=>'',
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},0,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},1,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'}."  ",2,1),
-					-size=>1,
-					-multiple=>0,
-					);
+        $row_data{defaultvalue} = $data->{defaultvalue};
+        $row_data{tab} = {
+                    id      => "tab$i",
+                    default => $data->{'tab'},
+                    };
+        $row_data{ohidden} = {
+                    id      => "ohidden$i",
+                    default => $data->{'hidden'}
+                    };
+		#$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
+		#			-id=>"ihidden$i",
+		#			-values=>['0','1','2'],
+		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
+		#							'2' =>'Hide',
+		#							},
+		#			-default=>substr($data->{'hidden'},1,1),
+		#			-size=>1,
+		#			-multiple=>0,
+		#			);
+		#$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
+		#			-id=>"ehidden$i",
+		#			-values=>['0','1','2'],
+		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
+		#							'2' =>'Hide',
+		#							},
+		#			-default=>substr($data->{'hidden'}."  ",2,1),
+		#			-size=>1,
+		#			-multiple=>0,
+		#			);
 		$row_data{tagsubfieldinput} = "<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
 		$row_data{tagsubfield} = $data->{'tagsubfield'};
 		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
@@ -275,39 +253,44 @@ if ($op eq 'add_form') {
 					);
 		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
 					-id=>"ohidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
+					#-values=>['0','1','2'],
+					#-labels => {'0'=>'Show','1'=>'Show Collapsed',
+					#				'2' =>'Hide',
+					#				},
+					-values=>['0','-5'],
+					-labels => {'0'=>'Show All','-5'=>'Hide All',},
+					#-default=>"0",
+					-default=>$data->{'hidden'},
+					#-default=>"-5",
 					-size=>1,
 					-multiple=>0,
 					);
 
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfieldinput} = 
-			"<label><input type=\"text\" name=\"tagsubfield\" value=\""
-			. $data->{'tagsubfield'}
-			. "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" /></label>";
+		#$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
+		#			-id=>"ihidden$i",
+		#			-values=>['0','1','2'],
+		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
+		#							'2' =>'Hide',
+		#							},
+		#			-default=>"0",
+		#			-size=>1,
+		#			-multiple=>0,
+		#			);
+		#$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
+		#			-id=>"ehidden$i",
+		#			-values=>['0','1','2'],
+		#			-labels => {'0'=>'Show','1'=>'Show Collapsed',
+		#							'2' =>'Hide',
+		#							},
+		#			-default=>"0",
+		#			-size=>1,
+		#			-multiple=>0,
+		#			);
+		$row_data{tagsubfieldinput} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
+                $row_data{tagsubfieldinput} = 
+                        "<label><input type=\"text\" name=\"tagsubfield\" value=\""
+                        . $data->{'tagsubfield'}
+                        . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" /></label>";
 		$row_data{tagsubfield} = $data->{'tagsubfield'};
 		$row_data{liblibrarian} = "";
 		$row_data{libopac} = "";
@@ -361,8 +344,8 @@ if ($op eq 'add_form') {
 		$row_data{row} = $i;
 		push(@loop_data, \%row_data);
 	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param('heading-edit-subfields-p' => 1);
+	$template->param('use_heading_flags_p' => 1);
+	$template->param('heading_edit_subfields_p' => 1);
 	$template->param(action => "Edit subfields",
 							tagfield => $tagfield,
 							tagfieldinput => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />",
@@ -377,10 +360,10 @@ if ($op eq 'add_form') {
 	$template->param(tagfield => "$input->param('tagfield')");
 #	my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl)
 #									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	my $sth_insert = $dbh->prepare("insert into auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl)
-									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	my $sth_update = $dbh->prepare("update auth_subfield_structure set authtypecode=?, tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, frameworkcode=?, value_builder=?, hidden=?, isurl=?
-									where authtypecode=? and tagfield=? and tagsubfield=?");
+    my $sth_insert = $dbh->prepare("insert into auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl,defaultvalue)
+                                    values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+    my $sth_update = $dbh->prepare("update auth_subfield_structure set authtypecode=?, tagfield=?, tagsubfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, kohafield=?, tab=?, seealso=?, authorised_value=?, frameworkcode=?, value_builder=?, hidden=?, isurl=?, defaultvalue=?
+                                    where authtypecode=? and tagfield=? and tagsubfield=?");
 	my @tagsubfield	= $input->param('tagsubfield');
 	my @liblibrarian	= $input->param('liblibrarian');
 	my @libopac		= $input->param('libopac');
@@ -389,12 +372,13 @@ if ($op eq 'add_form') {
 	my @seealso		= $input->param('seealso');
 	my @hidden;
 	my @ohidden		= $input->param('ohidden');
-	my @ihidden		= $input->param('ihidden');
-	my @ehidden		= $input->param('ehidden');
+	#my @ihidden		= $input->param('ihidden');
+	#my @ehidden		= $input->param('ehidden');
 	my @authorised_values	= $input->param('authorised_value');
 	my $authtypecode	= $input->param('authtypecode');
 	my @frameworkcodes	= $input->param('frameworkcode');
 	my @value_builder	=$input->param('value_builder');
+    my @defaultvalue = $input->param('defaultvalue');
 	for (my $i=0; $i<= $#tagsubfield ; $i++) {
 		my $tagfield			=$input->param('tagfield');
 		my $tagsubfield		=$tagsubfield[$i];
@@ -409,7 +393,9 @@ if ($op eq 'add_form') {
 		my $authorised_value		=$authorised_values[$i];
 		my $frameworkcode		=$frameworkcodes[$i];
 		my $value_builder=$value_builder[$i];
-		my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
+        my $defaultvalue = $defaultvalue[$i];
+		#my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
+		my $hidden = $ohidden[$i]; #collate from 3 hiddens;
 		my $isurl = $input->param("isurl$i")?1:0;
 		if ($liblibrarian) {
 			unless (C4::Context->config('demo') eq 1) {
@@ -430,6 +416,7 @@ if ($op eq 'add_form') {
 						$value_builder,
 						$hidden,
 						$isurl,
+                        $defaultvalue,
 						(
 							$authtypecode,
 							$tagfield,
@@ -453,6 +440,7 @@ if ($op eq 'add_form') {
 						$value_builder,
 						$hidden,
 						$isurl,
+                        $defaultvalue,
 					);
 				}
 			}