Changeset 2860 in products for quintagroup.referencedatagridfield

Timestamp:

Sep 27, 2010 12:27:10 PM (14 years ago)

Author:

kroman0

Message:

Fixed bugs

Location:

quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield

Files:

• _field.py (modified) (3 diffs)
• columns.py (modified) (1 diff)
• skins/referencedatagridfield/referencebrowser_popup.pt (modified) (1 diff)
• skins/referencedatagridfield/referencedatagridbrowser.js (moved) (moved from quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencebrowser.js) (2 diffs)
• skins/referencedatagridfield/referencedatagridwidget.pt (modified) (2 diffs)
• skins/referencedatagridfield/referencedatagridwidget_edit_row.pt (added)
• skins/referencedatagridfield/referencedatagridwidget_manipulators.pt (moved) (moved from quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/skins/referencedatagridfield/datagridwidget_manipulators.pt) (1 diff)

quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/_field.py

@@ -33 +33 @@
         'macro': "referencedatagridwidget",
         'helper_css': ('datagridwidget.css','referencedatagridwidget.css'),
-        'helper_js': ('referencebrowser.js', 'datagridwidget.js',),
+        'helper_js': ('referencedatagridbrowser.js', 'datagridwidget.js',),
         'force_close_on_insert': True,
         'columns': {
@@ -138 +138 @@
         rows = DataGridField.get(self, instance, **kwargs)
         for row in rows:
+            uid = row.get("uid","")
+            link = row.get("link","")
+            title = row.get("title","")
             result.append({
                 # DataGridField row data
-                "uid": row["uid"],
-                "link": row["link"],
-                "title": row["title"],
+                "uid": uid, "link": link, "title": title,
                 # View data
-                "url": "",
-                "default_title": None})
+                "url": "", "default_title": None})
             data = result[-1]
             # Process remote URL and collect UIDs
-            if row["link"]:
-                data["url"] = quote(row["link"], safe='?$#@/:=+;$,&%')
-                data["default_title"] = row["link"]
+            if link:
+                data["url"] = quote(link, safe='?$#@/:=+;$,&%')
+                data["default_title"] = link
                 # if title not set for remote url - set it equals to url
                 if not data["title"]:
                     data["title"] = data["default_title"]
             else:
-                uids[row["uid"]] = data
+                uids[uid] = data
         # Process UIDs
         if uids:
@@ -167 +167 @@
                 if not data["title"]:
                     data["title"] = data["default_title"]
+            # Remove records with links to unexistent objects
+            del_uids = set(uids.keys()) - set([b.UID for b in brains])
+            result = filter(lambda r: not r["uid"] in del_uids, result)
 
         return result

quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/columns.py

@@ -110 +110 @@
             default = rows[self.trigger]
             # if default is not epty string - than it is same to original value
+            if isinstance(current, str): 
+                current = current.decode('utf-8')
+            if isinstance(default, str):
+                default = default.decode('utf-8')
             if current == default:
                 sclass = self.class_not_changed

quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencebrowser_popup.pt

@@ -276 +276 @@
                                         <img src="#" tal:attributes="src string:${here/portal_url}/${item/getIcon};alt item/Title" />
                                         <a tal:condition="python: item.isPrincipiaFolderish and allow_browse"
-                                           tal:attributes="href python:item.absolute_url() + '/' + template.getId() + '?fieldName='+ fieldName + '&amp;fieldRealName=' + fieldRealName + '&amp;at_url='+at_url + '&amp;order_idx='+order_idx + '&amp;fieldTitleName='+fieldTitleName + '&amp;fieldLinkName='+fieldLinkName">
+                                           tal:attributes="href string:${item/absolute_url}/${template/getId}?fieldName=${fieldName}&amp;fieldRealName=${fieldRealName}&amp;at_url=${at_url}&amp;order_idx=${order_idx}&amp;fieldTitleName=${fieldTitleName}&amp;fieldLinkName=${fieldLinkName}">
                                             <strong tal:condition="referenceable"
                                                     tal:content="item/title_or_id">Title</strong>

quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencedatagridbrowser.js

@@ -135 +135 @@
 
 
-function referencebrowser_openBrowser(path, fieldName, at_url, fieldRealName, fieldTitleName, fieldLinkName, currnode) {
+function referencedatagridbrowser_openBrowser(path, fieldName, at_url, fieldRealName, fieldTitleName, fieldLinkName, currnode) {
     var url = path + '/referencebrowser_popup?fieldName=' + fieldName + '&fieldRealName=' + fieldRealName +'&at_url=' + at_url;
 
@@ -162 +162 @@
 
 // function to return a reference from the popup window back into the widget
-function referencebrowser_setReference(widget_id, uid, label, multi, order_idx, widget_title_id, link_title, widget_link_id, link_path)
+function referencedatagridbrowser_setReference(widget_id, uid, label, multi, order_idx, widget_title_id, link_title, widget_link_id, link_path)
 {
     if (order_idx >= 0) {

quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencedatagridwidget.pt

@@ -62 +62 @@
                 
                     <tal:row-loop tal:repeat="rows fielddata" tal:define="newRow python: False">
-                        <tal:row metal:use-macro="here/datagridwidget_edit_row/macros/edit_row"/>
+                        <tal:row metal:use-macro="here/referencedatagridwidget_edit_row/macros/edit_row"/>
                     </tal:row-loop>
 
@@ -70 +70 @@
                     
                         <tal:empty-row tal:define="newRow python: True">
-                                <tal:template metal:use-macro="here/datagridwidget_edit_row/macros/edit_empty_row"/>                    
+                                <tal:template metal:use-macro="here/referencedatagridwidget_edit_row/macros/edit_empty_row"/>                   
                         </tal:empty-row>                                
                  </tbody>

quintagroup.referencedatagridfield/branches/plone3/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencedatagridwidget_manipulators.pt

@@ -36 +36 @@
                                onClick=""
                                i18n:attributes="value label_select;"
-                               tal:attributes="onClick string:javascript:referencebrowser_openBrowser('${startup_directory}','${field_id}', '${at_url}', '${fieldRealName}', '${field_title_id}', '${field_link_id}', this)" />
+                               tal:attributes="onClick string:javascript:referencedatagridbrowser_openBrowser('${startup_directory}','${field_id}', '${at_url}', '${fieldRealName}', '${field_title_id}', '${field_link_id}', this)" />
                     </div>
                 </td>