[gen] Ref field: param 'link' can now be 'list' (ongoing work).

gen/mixins/__init__.py

@@ -191,6 +191,18 @@ class BaseMixin:
         self.say(self.translate('action_done'))
         self.goto(urlBack)
 
+    def onLink(self):
+        '''Called when an object linking is triggered from the ui.'''
+        rq = self.REQUEST
+        tool = self.getTool()
+        sourceObject = tool.getObject(rq['sourceUid'])
+        targetObject = tool.getObject(rq['targetUid'])
+        field = sourceObject.getAppyType(rq['fieldName'])
+        field.linkObject(sourceObject, targetObject)
+        urlBack = self.getUrl(rq['HTTP_REFERER'])
+        self.say(self.translate('action_done'))
+        self.goto(urlBack)
+
     def onCreate(self):
         '''This method is called when a user wants to create a root object in
            the "data" folder or an object through a reference field. A temporary
@@ -1263,7 +1275,7 @@ class BaseMixin:
     # --------------------------------------------------------------------------
     def UID(self):
         '''Returns the unique identifier for this object.'''
-        return self._at_uid
+        return self.id
 
     def Title(self):
         '''Returns the title for this object.'''

gen/tr/Appy.pot

@@ -83,6 +83,14 @@ msgstr ""
 msgid "add_ref"
 msgstr ""
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr ""
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr ""
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr ""
@@ -187,6 +195,10 @@ msgstr ""
 msgid "object_unlink"
 msgstr ""
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr ""
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr ""

gen/tr/ar.po

@@ -83,6 +83,14 @@ msgstr ""
 msgid "add_ref"
 msgstr ""
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr ""
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr ""
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr ""
@@ -187,6 +195,10 @@ msgstr ""
 msgid "object_unlink"
 msgstr ""
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr ""
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr ""

gen/tr/de.po

@@ -83,6 +83,14 @@ msgstr "Kein Element"
 msgid "add_ref"
 msgstr "Hinzufügen"
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr ""
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr ""
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr "Der Auftrag wird ausgeführt."
@@ -187,6 +195,10 @@ msgstr "Löschen"
 msgid "object_unlink"
 msgstr ""
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr ""
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr ""

gen/tr/en.po

@@ -84,6 +84,14 @@ msgstr "No object."
 msgid "add_ref"
 msgstr "Add a new one"
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr "Selectable elements"
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr "Selected elements"
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr "The action has been successfully executed."
@@ -188,6 +196,10 @@ msgstr "Delete"
 msgid "object_unlink"
 msgstr "Unlink"
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr "Insert"
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr "Unlock"

gen/tr/es.po

@@ -83,6 +83,14 @@ msgstr "Ningún elemento."
 msgid "add_ref"
 msgstr "Añadir"
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr ""
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr ""
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr "La acción ha sido efectuada."
@@ -187,6 +195,10 @@ msgstr "Eliminar"
 msgid "object_unlink"
 msgstr ""
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr ""
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr ""

gen/tr/fr.po

@@ -84,6 +84,14 @@ msgstr "Aucun élément."
 msgid "add_ref"
 msgstr "Ajouter"
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr "Éléments sélectionnables"
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr "Éléments sélectionnés"
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr "L'action a été effectuée."
@@ -188,6 +196,10 @@ msgstr "Supprimer"
 msgid "object_unlink"
 msgstr "Dissocier"
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr "Insérer"
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr "Déverrouiller"

gen/tr/it.po

@@ -83,6 +83,14 @@ msgstr "Nessun elemento"
 msgid "add_ref"
 msgstr "Aggiungi un nuovo"
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr ""
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr ""
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr "L'operazione è stata eseguita con successo"
@@ -187,6 +195,10 @@ msgstr "Elimina"
 msgid "object_unlink"
 msgstr ""
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr ""
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr ""

gen/tr/nl.po

@@ -83,6 +83,14 @@ msgstr "Geen element."
 msgid "add_ref"
 msgstr "Toevoegen"
 
+#. Default: "Selectable elements"
+msgid "selectable_objects"
+msgstr ""
+
+#. Default: "Selected elements"
+msgid "selected_objects"
+msgstr ""
+
 #. Default: "The action has been successfully executed."
 msgid "action_ok"
 msgstr "De opdracht werd uitgevoerd."
@@ -187,6 +195,10 @@ msgstr "Verwijderen"
 msgid "object_unlink"
 msgstr ""
 
+#. Default: "Insert"
+msgid "object_link"
+msgstr ""
+
 #. Default: "Unlock"
 msgid "page_unlock"
 msgstr ""

gen/ui/appy.js

@@ -464,6 +464,14 @@ function onUnlinkObject(sourceUid, fieldName, targetUid) {
   askConfirm('form', 'unlinkForm', action_confirm);
 }
 
+function onLinkObject(sourceUid, fieldName, targetUid) {
+  f = document.getElementById('linkForm');
+  f.sourceUid.value = sourceUid;
+  f.fieldName.value = fieldName;
+  f.targetUid.value = targetUid;
+  f.submit();
+}
+
 function onUnlockPage(objectUid, pageName) {
   f = document.getElementById('unlockForm');
   f.objectUid.value = objectUid;

gen/wrappers/ToolWrapper.py

@@ -122,6 +122,13 @@ class ToolWrapper(AbstractWrapper):
       <input type="hidden" name="fieldName"/>
       <input type="hidden" name="targetUid"/>
      </form>
+     <!-- Global form for linking an object -->
+     <form id="linkForm" method="post" action="do">
+      <input type="hidden" name="action" value="Link"/>
+      <input type="hidden" name="sourceUid"/>
+      <input type="hidden" name="fieldName"/>
+      <input type="hidden" name="targetUid"/>
+     </form>
      <!-- Global form for unlocking a page -->
      <form id="unlockForm" method="post" action="do">
       <input type="hidden" name="action" value="Unlock"/>