Changeset 388

Timestamp:

09/21/12 13:05:17 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend location view on the record page to either show a dropdown
when adding/editing if the user has record_locchg permission, or
just show the location's short description if not. See #10.
Also add the new permission to the permissions subtemplate.

Location:

trunk

Files:

• dns.cgi (modified) (1 diff)
• templates/permlist.tmpl (modified) (1 diff)
• templates/record.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -2121 +2121 @@
   return unless ($permissions{admin} || $permissions{location_view});
 
-  my $loclist = getLocDropdown($dbh, $cur, $defloc);
-
   $page->param(location_view => ($permissions{admin} || $permissions{location_view}));
-  $page->param(loclist => $loclist);
+
+  if ($permissions{admin} || $permissions{record_locchg}) {
+    my $loclist = getLocDropdown($dbh, $cur, $defloc);
+    $page->param(record_locchg => 1);
+    $page->param(loclist => $loclist);
+  } else {
+    my $loc = getLoc($dbh, $defloc);
+    $page->param(loc_name => $loc->{description});
+  }
 } # end fill_loclist()
 

trunk/templates/permlist.tmpl

@@ -22 +22 @@
         <td<TMPL_UNLESS may_record_create> class="<TMPL_UNLESS info>noaccess<TMPL_ELSE>info</TMPL_UNLESS>"</TMPL_UNLESS>><input type="checkbox"<TMPL_UNLESS info> name="record_create"</TMPL_UNLESS><TMPL_IF record_create> checked="checked"</TMPL_IF><TMPL_UNLESS may_record_create> disabled="disabled"</TMPL_UNLESS> /> Create</td>
         <td<TMPL_UNLESS may_record_delete> class="<TMPL_UNLESS info>noaccess<TMPL_ELSE>info</TMPL_UNLESS>"</TMPL_UNLESS>><input type="checkbox"<TMPL_UNLESS info> name="record_delete"</TMPL_UNLESS><TMPL_IF record_delete> checked="checked"</TMPL_IF><TMPL_UNLESS may_record_delete> disabled="disabled"</TMPL_UNLESS> /> Delete</td>
+        <td<TMPL_UNLESS may_record_locchg> class="<TMPL_UNLESS info>noaccess<TMPL_ELSE>info</TMPL_UNLESS>"</TMPL_UNLESS>><input type="checkbox"<TMPL_UNLESS info> name="record_locchg"</TMPL_UNLESS><TMPL_IF record_locchg> checked="checked"</TMPL_IF><TMPL_UNLESS may_record_locchg> disabled="disabled"</TMPL_UNLESS> /> Change location</td>
         <!-- td class="noaccess"> - Delegate</td -->
 </tr>

trunk/templates/record.tmpl

@@ -73 +73 @@
         <tr class="datalinelight">
                 <td>Location/view</td>
+<TMPL_IF record_locchg>
                 <td><select name="location">
 <TMPL_LOOP name=loclist>                <option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected="selected"</TMPL_IF>><TMPL_VAR NAME=locname></option>
 </TMPL_LOOP>
                 </select></td>
+<TMPL_ELSE>
+                <td><TMPL_VAR NAME=loc_name></td>
+</TMPL_IF>
         </tr>
 </TMPL_IF>