Merge branch 'release/0.7.7'

zetaops · Dec 23, 2016 · 6bb0041 · 6bb0041
2 parents 06c18ef + 61360f6
commit 6bb0041
Show file tree

Hide file tree

Showing 32 changed files with 1,426 additions and 194 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.7.6
+v0.7.7
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='zengine',
-    version='0.7.6',
+    version='0.7.7',
     url='https://github.com/zetaops/zengine',
     license='GPL v3',
     packages=find_packages(exclude=['tests', 'tests.*']),

diff --git a/tests/diagrams/multiuser.bpmn b/tests/diagrams/multiuser.bpmn
@@ -3,21 +3,27 @@
   <bpmn:collaboration id="_">
     <bpmn:participant id="Participant_1q17fze" name="Manager - Employee Interaction" processRef="multiuser" />
   </bpmn:collaboration>
-  <bpmn:process id="multiuser" name="" isExecutable="false">
+  <bpmn:process id="multiuser" name="Manager - Employee Interaction" isExecutable="false">
     <bpmn:laneSet>
       <bpmn:lane id="manager" name="Manager">
+        <bpmn:extensionElements>
+          <camunda:properties>
+            <camunda:property name="owners" value="[employee.project_set[0].project.manager]" />
+          </camunda:properties>
+        </bpmn:extensionElements>
         <bpmn:flowNodeRef>StartEvent_1</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>assign</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>EndEvent_0lk561c</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>finish</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="employee" name="Employee">
         <bpmn:extensionElements>
           <camunda:properties>
-            <camunda:property name="owners" value="manager.project_set[0].project.Employee" />
+            <camunda:property name="owners" value="[manager.project_set[0].project.Employee[0].employee]" />
             <camunda:property name="relations" value="self in manager.project_set[0].project.assigned_employees" />
           </camunda:properties>
         </bpmn:extensionElements>
         <bpmn:flowNodeRef>perform</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>EndEvent_0lk561c</bpmn:flowNodeRef>
       </bpmn:lane>
     </bpmn:laneSet>
     <bpmn:startEvent id="StartEvent_1">
@@ -33,15 +39,20 @@
       <bpmn:incoming>SequenceFlow_0t5ur2v</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0ubdg39</bpmn:outgoing>
     </bpmn:task>
-    <bpmn:sequenceFlow id="SequenceFlow_0ubdg39" sourceRef="perform" targetRef="EndEvent_0lk561c" />
+    <bpmn:sequenceFlow id="SequenceFlow_0ubdg39" sourceRef="perform" targetRef="finish" />
     <bpmn:endEvent id="EndEvent_0lk561c">
-      <bpmn:incoming>SequenceFlow_0ubdg39</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_0uiulqw</bpmn:incoming>
     </bpmn:endEvent>
+    <bpmn:task id="finish" name="Finish Task">
+      <bpmn:incoming>SequenceFlow_0ubdg39</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_0uiulqw</bpmn:outgoing>
+    </bpmn:task>
+    <bpmn:sequenceFlow id="SequenceFlow_0uiulqw" sourceRef="finish" targetRef="EndEvent_0lk561c" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="_">
       <bpmndi:BPMNShape id="Participant_1q17fze_di" bpmnElement="Participant_1q17fze">
-        <dc:Bounds x="103" y="-64" width="370" height="250" />
+        <dc:Bounds x="103" y="-66" width="621" height="252" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="172" y="-19" width="36" height="36" />
@@ -50,10 +61,10 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_19c4fqn_di" bpmnElement="manager">
-        <dc:Bounds x="133" y="-64" width="340" height="122" />
+        <dc:Bounds x="133" y="-66" width="591" height="124" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_12f7efa_di" bpmnElement="employee">
-        <dc:Bounds x="133" y="58" width="340" height="128" />
+        <dc:Bounds x="133" y="58" width="591" height="128" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Task_1rh4ih9_di" bpmnElement="assign">
         <dc:Bounds x="271.7099322799097" y="-41" width="100" height="80" />
@@ -77,17 +88,28 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0ubdg39_di" bpmnElement="SequenceFlow_0ubdg39">
         <di:waypoint xsi:type="dc:Point" x="372" y="119" />
-        <di:waypoint xsi:type="dc:Point" x="414" y="119" />
+        <di:waypoint xsi:type="dc:Point" x="506" y="119" />
+        <di:waypoint xsi:type="dc:Point" x="506" y="39" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="348" y="94" width="90" height="20" />
+          <dc:Bounds x="394" y="94" width="90" height="20" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0lk561c_di" bpmnElement="EndEvent_0lk561c">
-        <dc:Bounds x="413.7104037267081" y="101" width="36" height="36" />
+        <dc:Bounds x="639" y="-19" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="386.7104037267081" y="137" width="90" height="20" />
+          <dc:Bounds x="612" y="17" width="90" height="20" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Task_1ce8npw_di" bpmnElement="finish">
+        <dc:Bounds x="460.44910179640715" y="-41" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0uiulqw_di" bpmnElement="SequenceFlow_0uiulqw">
+        <di:waypoint xsi:type="dc:Point" x="560" y="-1" />
+        <di:waypoint xsi:type="dc:Point" x="639" y="-1" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="554.5" y="-26" width="90" height="20" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/tests/diagrams/sequential_cruds.bpmn b/tests/diagrams/sequential_cruds.bpmn
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_qyVjYLNPEeSf4I-xcGOQ0Q" targetNamespace="http://activiti.org/bpmn" exporter="camunda modeler" exporterVersion="2.7.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://activiti.org/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_qyVjYLNPEeSf4I-xcGOQ0Q" targetNamespace="http://activiti.org/bpmn" exporter="Camunda Modeler" exporterVersion="1.2.2" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="sequential_cruds" name="sequential_cruds" isExecutable="false">
     <bpmn2:extensionElements>
       <camunda:properties>
         <camunda:property name="menu_category" value="hidden" />
+        <camunda:property name="init" value="True" />
       </camunda:properties>
     </bpmn2:extensionElements>
     <bpmn2:startEvent id="StartEvent_1">

diff --git a/tests/fixtures/base.csv b/tests/fixtures/base.csv
@@ -40,6 +40,16 @@ permission/|workflow_management/|{"abstract_role_set": [], "code": "workflow_man
 permission/|role_switching/|{"abstract_role_set": [], "code": "role_switching", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-14T21:26:30.487511Z", "updated_at": "2016-11-14T21:26:30.488019Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Role Switching"}
 permission/|role_switching..ListUserRoles/|{"abstract_role_set": [], "code": "role_switching..ListUserRoles", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-14T21:26:30.496967Z", "updated_at": "2016-11-14T21:26:30.497437Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "List User Roles UserTask"}
 permission/|role_switching..ChangeUserRole/|{"abstract_role_set": [], "code": "role_switching..ChangeUserRole", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-14T21:26:30.510969Z", "updated_at": "2016-11-14T21:26:30.511425Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Change User Role ServiceTask"}
+permission/|postpone_workflow/|{"abstract_role_set": [], "code": "postpone_workflow", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.701063Z", "updated_at": "2016-11-24T09:40:45.701816Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "postpone_workflow"}
+permission/|postpone_workflow..save_date/|{"abstract_role_set": [], "code": "postpone_workflow..save_date", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.711302Z", "updated_at": "2016-11-24T09:40:45.711786Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Save Date ServiceTask"}
+permission/|postpone_workflow..select_postponed_date/|{"abstract_role_set": [], "code": "postpone_workflow..select_postponed_date", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.727998Z", "updated_at": "2016-11-24T09:40:45.728657Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Select Postponed Date UserTask"}
+permission/|suspend_workflow/|{"abstract_role_set": [], "code": "suspend_workflow", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.753012Z", "updated_at": "2016-11-24T09:40:45.753651Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "suspend_workflow"}
+permission/|suspend_workflow..suspend/|{"abstract_role_set": [], "code": "suspend_workflow..suspend", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.763823Z", "updated_at": "2016-11-24T09:40:45.764285Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Suspend Workflow ServiceTask"}
+permission/|task_assign_yourself/|{"abstract_role_set": [], "code": "task_assign_yourself", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.785348Z", "updated_at": "2016-11-24T09:40:45.785813Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "task_assign_yourself"}
+permission/|task_assign_yourself..assign_yourself/|{"abstract_role_set": [], "code": "task_assign_yourself..assign_yourself", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.795473Z", "updated_at": "2016-11-24T09:40:45.795956Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Assign Yourself ServiceTask"}
+permission/|assign_same_abstract_role/|{"abstract_role_set": [], "code": "assign_same_abstract_role", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.518325Z", "updated_at": "2016-11-24T09:40:45.519071Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "assign_same_abstract_role"}
+permission/|assign_same_abstract_role..send_workflow/|{"abstract_role_set": [], "code": "assign_same_abstract_role..send_workflow", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.534009Z", "updated_at": "2016-11-24T09:40:45.534520Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Send Workflow ServiceTask"}
+permission/|assign_same_abstract_role..select_role/|{"abstract_role_set": [], "code": "assign_same_abstract_role..select_role", "description": "", "role_set": [], "deleted": false, "timestamp": "2016-11-24T09:40:45.544982Z", "updated_at": "2016-11-24T09:40:45.545552Z", "deleted_at": "0000-00-00T00:00:00Z", "name": "Select Role UserTask"}
 teacher/|9qmpuevQivaaM3a820JhPTMgQpa/|{"surname": "Turing", "name": "Alan", "deleted": false, "timestamp": "2016-10-18T08:00:36.000000Z", "exam_set": [{"exam_id": "SN1x4Pp5ZpGFwC9KG5907EgpILy"}], "updated_at": "2016-10-18T09:06:29.686466Z", "deleted_at": "0000-00-00T00:00:00Z"}
 exam/|SN1x4Pp5ZpGFwC9KG5907EgpILy/|{"teacher_id": "9qmpuevQivaaM3a820JhPTMgQpa", "deleted": false, "timestamp": "2016-10-18T08:00:03.000000Z", "updated_at": "2016-10-18T08:52:42.814194Z", "date": "2016-10-10T00:00:00.000000Z", "deleted_at": "0000-00-00T00:00:00Z", "exam_type": 1}
 program/|CAdEenpWCdrPrfeUthY7tX49HFx/|{"name": "Test Program 1", "deleted": false, "timestamp": "2016-10-31T08:00:08.000000Z", "updated_at": "2016-10-31T08:44:36.145930Z", "role_id": "WOJt2XKpYEfhAPFl5jPJXIZSrGD", "deleted_at": "0000-00-00T00:00:00Z", "typ": 1}

diff --git a/tests/locale/tr/LC_MESSAGES/zengine.po b/tests/locale/tr/LC_MESSAGES/zengine.po
@@ -120,3 +120,26 @@ msgstr "Sil"
 msgid "Edit"
 msgstr "Düzenle"
 
+#: ../../zengine/zengine/views/system.py:95
+msgid "Assign Someone Else"
+msgstr "Başkasına Ata"
+
+#: ../../zengine/zengine/views/system.py:96
+msgid "Suspend"
+msgstr "Askıya Al"
+
+#: ../../zengine/zengine/views/system.py:97
+msgid "Postpone"
+msgstr "Ertele"
+
+#: ../../zengine/zengine/views/system.py:99
+msgid "Assign Yourself"
+msgstr "Kendine Ata"
+
+#: ../../zengine/zengine/views/task_manager_actions.py:48
+msgid "Successful"
+msgstr "Başarılı"
+
+#: ../../zengine/zengine/views/task_manager_actions.py:51
+msgid "Unsuccessful"
+msgstr "Başarısız"