Changeset 892 for trunk

Timestamp:

11/01/16 15:10:39 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit tweak to city selection; on allocate-from-freeblock, preselect the
city of the parent

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (3 diffs)
• templates/assign.tmpl (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -508 +508 @@
     my $pinfo = getBlockData($ip_dbh, $webvar{parent});
 
+    my @cities;
+    foreach my $city (@citylist) {
+      my %row = (city => $city, sel => ($pinfo->{city} eq $city) );
+      push (@cities, \%row);
+    }
+    $page->param(preselected => 1);
+    $page->param(citylist => \@cities);
+
     # Tree navigation
     my $crumbs = getBreadCrumbs($ip_dbh, $webvar{parent});
@@ -543 +551 @@
     $page->param(pops => \@pops);
 
+    my @cities;
+    foreach my $city (@citylist) {
+      my %row = (city => $city);
+      push (@cities, \%row);
+    }
+    $page->param(citylist => \@cities);
+
     # get all standard alloctypes
     my $tlist = getTypeList($ip_dbh, 'a');
@@ -548 +563 @@
     $page->param(typelist => $tlist);
   }
-
-  my @cities;
-  foreach my $city (@citylist) {
-    my %row = (city => $city);
-    push (@cities, \%row);
-  }
-  $page->param(citylist => \@cities);
 
 ## node hack

trunk/templates/assign.tmpl

@@ -42 +42 @@
 <td>
 <select name="city">
+<TMPL_IF preselected>
+<TMPL_LOOP NAME=citylist>
+        <option<TMPL_IF sel> selected</TMPL_IF>><TMPL_VAR NAME=city></option></TMPL_LOOP>
+<TMPL_ELSE>
         <option selected="selected">-</option>
 <TMPL_LOOP NAME=citylist>
         <option><TMPL_VAR NAME=city></option></TMPL_LOOP>
+</TMPL_IF>
 </select>
 &nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newcity.cgi')">Add new location</a>