Changeset 362

Timestamp:

08/17/09 05:33:11 (15 years ago)

Author:

nanardon

Message:

• try to set only writable attributes since we strictly check the query
• use field display value instead return value to fetch ajax data

File:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (8 diffs)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -202 +202 @@
             );
             $html .= q{<DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>};
-            $html .= qq{
+            $html .= qq|
             <A HREF="#"
                 onClick="cal13.select(document.forms[0].$htmlname,'${htmlname}_anc','dd/MM/yyyy');return false;"
                 TITLE="cal13.select(document.forms[0].$htmlname,'${htmlname}_anc','dd/MM/yyyy');return false;"
                 NAME="${htmlname}_anc" ID="${htmlname}_anc">
-                <img src="} . $self->{c}->uri_for(qw(/static icons view-calendar-day.png))
-                . qq{" style="ref"></A>} . "\n";
+                <img src="| . $self->{c}->uri_for(qw(/static icons view-calendar-day.png))
+                . qq{" style="ref"></A>
+                } . "\n";
             return $html;
         };
@@ -215 +216 @@
                 $self->escape($htmlname),
                 $self->attr_raw_value($attr) ? '  checked="yes"' : ''
-            );
+            ) . sprintf('<input type="hidden" name="%s">',
+                $self->escape($htmlname));
         };
         /^select(-\w+)?:([^:]+)(?::(.*))?$/ and do {
@@ -221 +223 @@
             my $otype = $2;
             my $keyfield = $3;
+            my $observe_keyfield = $keyfield || 'displayName';
             my $select = sprintf('<select id="%s" name="%s">',
                 $self->escape($htmlname),
@@ -226 +229 @@
             $select .= '<option value="">--</option>' . "\n" if ($options =~ /N/);
             my $value = $self->attr_raw_value($attr) || '';
+            my $initial_observed = '';
             foreach my $id ($self->base->list_objects($otype)) {
                 my $obj = $self->base->get_object($otype, $id) or next;
@@ -236 +240 @@
                 );
                 $select .= "\n";
+                $initial_observed = $obj->get_c_field($observe_keyfield)
+                    if($value eq $val);
             }
             $select .= "</select>\n";
@@ -242 +248 @@
                 url => $self->{c}->uri_for('/ajax', 'rawattr', $otype),
                 frequency => 1,
-                with   => "'attr=displayName&id='+value",
+                with   => "'attr=" . $observe_keyfield .
+                "&id='+element.options[element.selectedIndex].text",
             }) .
-            qq{<span id="${htmlname}_span"></span>};
+            qq|<span id="${htmlname}_span">$initial_observed</span>|;
             return $select;
         };
@@ -267 +274 @@
                 }
             ) .
-            qq{<span style="display:none" id="${htmlname}_stat">Searching...</span>};
+            qq|<span style="display:none" id="${htmlname}_stat">Searching...</span>|;
             }
             return $textf;
@@ -292 +299 @@
                 ? ($self->{c}->req->param("$prefix$_") ? 1 : 0)
                 : ($self->{c}->req->param("$prefix$_") || undef)
-        } $self->attributes
+        } grep { $self->base->get_field_name($self->otype, $_, 'w') } $self->attributes
     ) or return;
     $self->{object}->base->commit;