Changeset 1581 in main for branches

Timestamp:

08/30/12 08:31:15 (7 years ago)

Author:

pcosquer

Message:

branch 1.1: merge commits [1562], [1565], [1577] from trunk

Location:

branches/1.1/openPLM

Files:

• . (modified) (1 prop)
• apps/document3D/locale/es/LC_MESSAGES/django.mo (modified) (previous)
• apps/document3D/locale/fr/LC_MESSAGES/django.mo (modified) (previous)
• plmapp/controllers/document.py (modified) (1 diff)
• plmapp/controllers/part.py (modified) (1 diff)
• templates/attributes.html (modified) (1 diff)

branches/1.1/openPLM/plmapp/controllers/document.py

@@ -557 +557 @@
                 models.DocumentPartLink.objects.create(part=part,
                     document=new_ctrl.object)
+        details = "to %s//%s//%s//%s " %(new_ctrl.type, new_ctrl.reference, new_ctrl.revision, new_ctrl.name)
+        self._save_histo("Clone", details)
         return new_ctrl
         

branches/1.1/openPLM/plmapp/controllers/part.py

@@ -800 +800 @@
                 models.DocumentPartLink.objects.create(part=new_ctrl.object,
                     document=doc)
+        details = "to %s//%s//%s//%s " %(new_ctrl.type, new_ctrl.reference, new_ctrl.revision, new_ctrl.name)
+        self._save_histo("Clone", details)
         return new_ctrl
 

branches/1.1/openPLM/templates/attributes.html

@@ -117 +117 @@
                                     {% ifequal field.name "title" %} style="display:none;"{% endifequal %}
                                     >
-                                    {{ field }}
+                                    {% if field.name == "name" or field.name == "email" %}
+                                        <input type="text"
+                                        id="id_{{field.name}}" name="{{field.name}}"
+                                        {% ifequal field.name "name" %}
+                                            max_length=50 value="{{request.user.get_full_name}}"
+                                        {% else %}
+                                            value="{{request.user.email}}"
+                                        {% endifequal %}
+                                        >
+                                    {% else %}
+                                        {{ field }}
+                                    {% endif %}
                                 </div>
                             {% endif %}