[mb-commits] r8918 - in mb_server/trunk/htdocs: cdi scripts

Author: luks
Date: 2007-03-17 10:10:31 +0000 (Sat, 17 Mar 2007)
New Revision: 8918

Modified:
   mb_server/trunk/htdocs/cdi/enter.html
   mb_server/trunk/htdocs/scripts/editallconfig.js
Log:
Don't override the entered artistname.

Modified: mb_server/trunk/htdocs/cdi/enter.html
===================================================================
--- mb_server/trunk/htdocs/cdi/enter.html       2007-03-16 20:49:52 UTC (rev 
8917)
+++ mb_server/trunk/htdocs/cdi/enter.html       2007-03-17 10:10:31 UTC (rev 
8918)
@@ -249,16 +249,12 @@
        # has not filled all the fields yet.
        if ($ARGS{"v::showform"})
        {
-               if ($artistid > 0)
+               if ($artistid > 0 && !$ARGS{"artistname"})
                {
                   my $ar = Artist->new($mb->{DBH});
                   $ar->SetId($artistid);
                   $ar->LoadFromId();
                   $ARGS{"artistname"} = $ar->GetName();
-                  if (!defined $ARGS{"artistname"})
-                  {
-                          $ARGS{"artistname"} = 'Tabasco bondage action';
-                  }
                   $mb->Logout;
                }
 

Modified: mb_server/trunk/htdocs/scripts/editallconfig.js
===================================================================
--- mb_server/trunk/htdocs/scripts/editallconfig.js     2007-03-16 20:49:52 UTC 
(rev 8917)
+++ mb_server/trunk/htdocs/scripts/editallconfig.js     2007-03-17 10:10:31 UTC 
(rev 8918)
@@ -207,7 +207,7 @@
                                                        img.style.cursor = 
"hand";
                                                        td.appendChild(img);
 
-                                                       if (el.checked) {
+                                                       if (el.checked && 
index) {
                                                                
jsselect.registerAjaxSelect(es.ui.getField('tr'+index+'_artistname'), 'artist', 
partial(function(field, index, img, entity) {
                                                                        
ae.setArtistDisplay(false, entity, field, index);
                                                                        
es.ui.getField('tr'+index+'_artistid').value = entity.id;