Changeset 2300 in products for quintagroup.referencedatagridfield/trunk/quintagroup

Timestamp:

May 12, 2010 12:06:00 PM (14 years ago)

Author:

mylan

Message:

Make default value for the Title column take into consideration for exteranl links

Location:

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield

Files:

• _field.py (modified) (3 diffs)
• columns.py (modified) (2 diffs)
• skins/referencedatagridfield/referencebrowser.js (modified) (2 diffs)
• skins/referencedatagridfield/referencedatagrid_styled_cell.pt (modified) (2 diffs)

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield/_field.py

@@ -36 +36 @@
         'force_close_on_insert': True,
         'columns': {
-            'title': StyledColumn("Title", trigger_key="title_changed",
+            'title': StyledColumn("Title", trigger_key="default_title",
                                   blur_handler="triggerTitleClass",
                                   focus_handler="triggerOnFocusStyles",
@@ -144 +144 @@
                 "title": row["title"],
                 # View data
-                "url": ""})
+                "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 title not set for remote url - set it equals to url
                 if not data["title"]:
-                    data["title"] = row["link"]
+                    data["title"] = data["default_title"]
             else:
                 uids[row["uid"]] = data
@@ -161 +163 @@
                 data["url"] = b.getURL()
                 data["link"] = b.getPath()
+                data["default_title"] = self._brains_title_or_id(b, instance)
                 # If title not set - get it from the brain
                 if not data["title"]:
-                    data["title_changed"] = False
-                    data["title"] = self._brains_title_or_id(b, instance)
-                else:
-                    data["title_changed"] = True
-
+                    data["title"] = data["default_title"]
 
         return result

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield/columns.py

@@ -81 +81 @@
     security = ClassSecurityInfo()
 
-    
-
     def __init__(self, label, default=None, label_msgid=None,
                  trigger_key=None, blur_handler="", focus_handler="",
@@ -99 +97 @@
 
     security.declarePublic("getAttributes")
-    def getAttributes(self, rows):
+    def getAttributes(self, column_id, rows):
+        default = None
         blur_handler = None
         focus_handler = None
         sclass = self.class_no
 
-        if rows.has_key(self.trigger):
+        if rows.has_key(self.trigger) \
+           and rows.has_key(column_id):
             focus_handler = self.focus_handler
             blur_handler = self.blur_handler
-            if bool(rows[self.trigger]):
+            current = rows[column_id]
+            default = rows[self.trigger]
+            # if default is not epty string - than it is same to original value
+            if current == default:
+                sclass = self.class_not_changed
+            else:
                 sclass = self.class_changed
-            else:
-                sclass = self.class_not_changed
 
         return {'class': sclass,
                 'onblur': blur_handler,
-                'onfocus': focus_handler}
+                'onfocus': focus_handler,
+                'default': default}
 
     security.declarePublic('getMacro')

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencebrowser.js

@@ -37 +37 @@
     
     var current = element.value;
-    var initial = element.getAttribute("initial_value");
+    var initial = element.getAttribute("default_value");
     if (initial == null || current == null)
         return;
@@ -171 +171 @@
         title_element.value=link_title;
         title_element.className="not-changed-title-field";
-        title_element.setAttribute("initial_value", link_title);
+        title_element.setAttribute("default_value", link_title);
         addEvent(title_element, 'blur', triggerTitleClass, false)
         addEvent(title_element, 'focus', triggerOnFocusStyles, false)

quintagroup.referencedatagridfield/trunk/quintagroup/referencedatagridfield/skins/referencedatagridfield/referencedatagrid_styled_cell.pt

@@ -13 +13 @@
     <metal:edit_cell_macro define-macro="edit_cell">
        <input style="width: 100%" name="myfield.name:records"
-              tal:define="attribs python:column_definition.getAttributes(rows);"
+              tal:define="attribs python:column_definition.getAttributes(column, rows);"
               tal:attributes="name string:${fieldName}.${column}:records;
                           id string:${column}_${fieldId};
@@ -20 +20 @@
                           onblur python:attribs['onblur'];
                           onfocus python:attribs['onfocus'];
-                          initial_value cell_value;
+                          default_value python:attribs['default'];
                           "
            type="text" />