ソースを参照

Se modifica código por el uso de objets en vez de strings

Maximiliano Schvindt 8 年 前
コミット
ac76bdb2eb

+ 1 - 1
Controller/WorkflowController.php

@@ -27,7 +27,7 @@ class WorkflowController extends Controller
         $admin = $this->admin;
         $back_route = $admin->getBaseRouteName()."_list";
 
-        if(is_null($workflow)) {$workflow = "{$object->getWorkflowType()}.{$object->getWorkflow()}";}
+        if(is_null($workflow)) {$workflow = "{$object->getWorkflowType()}.{$object->getWorkflowName()}";}
 
         try {
             $this->get("{$workflow}")->apply($object, $transition);

+ 1 - 1
Event/EventSubscriber.php

@@ -96,7 +96,7 @@ class EventSubscriber implements EventSubscriberInterface
         $filter['event'] = $eventType;
         $filter['objectClass'] = $class;
         $filter['workflowType'] = $object->getWorkflowType();
-        $filter['workflowName'] = $object->getWorkflow();
+        $filter['workflowName'] = $object->getWorkflowName();
         $filter['eventReference'] = $eventReference;
 
         $logger->info("EVENT {$eventType}:{$eventReference} => {$class}_id_{$object->getId()}");

+ 5 - 5
Resources/views/Workflow/show_transitions.html.twig

@@ -1,11 +1,11 @@
-{% if object.getWorkflowObject() is null %}
+{% if object.getWorkflow() is null %}
     <a  href="#" name="transition" value="" class="btn btn-sm view_link btn-danger" disabled="disabled">{{ "Undefined Workflow"|trans({},'WorkflowBundle') }}</a>
 {% else %}
-    {% if workflow_correct_state(object, object.getWorkflow()) %}
-        {% for transition in workflow_transitions(object, object.getWorkflow()) %}
+    {% if workflow_correct_state(object, object.getWorkflowName()) %}
+        {% for transition in workflow_transitions(object, object.getWorkflowName()) %}
             <a  href="{{path('admin_workflow_workflow_apply_transition',{class: get_class(object), id:object.getId(), transition:transition.name})}}" name="transition" value="{{ transition.name }}"
-            {% if workflow_can(object, transition.name, object.getWorkflow()) -%}
-                class="btn btn-sm btn-default view_link"
+            {% if workflow_can(object, transition.name, object.getWorkflowName()) -%}
+                class="btn btn-sm btn-default view_link btn-info"
             {% else %}
                 class="btn btn-sm btn-default view_link btn-danger" disabled="disabled"
             {% endif %}

+ 52 - 38
Resources/views/Workflow/show_workflow.html.twig

@@ -2,48 +2,62 @@
 
 {% block main %}
     <h1>Object "{{ object}}"</h1>
-    <div class="row">
-        <div class="col-md-5">
-            <h2>Workflow: {{object.getWorkflow()}}</h2>
-            <p>
-                <code>
-                    {{get_class(object)}}::current_state = {{ object.getCurrentState() }}
-                </code>
-            </p>
-            <p>
-                <form action="{{ path('admin_workflow_workflow_reset_state', {class: get_class(object),id: object.getId()}) }}" method="post" class="form-inline">
-                    <button type="submit" class="btn btn-danger btn-xs">Reset State</button>
-                </form>
-            </p>
+    {#<div class="row">#}
+        {% if object.getWorkflow() is null %}
+        <div class="row">
+            <div class="col-md-5">
+                <h2>Workflow: Undefined</h2>
+                <p>
+                    <code>
+                        {{get_class(object)}}::current_state = {{ object.getCurrentState() }}
+                    </code>
+                </p>
+            </div>
         </div>
-        <div class="col-md-6">
-            <h2>What can you do?</h2>
-                <div class="btn-group-vertical" role="group">
-                    <code style="color:black;text-align:center">current_state</code> 
-                    {% if workflow_transitions(object, object.getWorkflow())|length > 0 %}
-                        {% for transition in workflow_transitions(object, object.getWorkflow()) %}
-                            <a  href="{{path('admin_workflow_workflow_apply_transition',{class: get_class(object),id:object.getId(),transition:transition.name})}}" name="transition" value="{{ transition.name }}"
-                                {% if workflow_can(object, transition.name, object.getWorkflow()) -%}
-                                    class="btn btn-primary"
-                                {%- else -%}
-                                    class="btn btn-danger" disabled="disabled"
-                                {%- endif -%}
-                            >
-                                {{ transition.name }}
-                            </a>
-                        {% endfor %}
-                    {% else %}
-                        <a  href="" name="transition" class="btn btn-danger" disabled="disabled">Sin opciones</a>
-                    {% endif %}
-                </div>
+        {% else %}
+        <div class="row">
+            <div class="col-md-5">
+                <h2>Workflow: {{object.getWorkflowName()}}</h2>
+                <p>
+                    <code>
+                        {{get_class(object)}}::current_state = {{ object.getCurrentState() }}
+                    </code>
+                </p>
+                <p>
+                    <form action="{{ path('admin_workflow_workflow_reset_state', {class: get_class(object),id: object.getId()}) }}" method="post" class="form-inline">
+                        <button type="submit" class="btn btn-danger btn-xs">Reset State</button>
+                    </form>
+                </p>
+            </div>
+            <div class="col-md-6">
+                <h2>What can you do?</h2>
+                    <div class="btn-group-vertical" role="group">
+                        <code style="color:black;text-align:center">current_state</code> 
+                        {% if workflow_transitions(object, object.getWorkflowName())|length > 0 %}
+                            {% for transition in workflow_transitions(object, object.getWorkflowName()) %}
+                                <a  href="{{path('admin_workflow_workflow_apply_transition',{class: get_class(object),id:object.getId(),transition:transition.name})}}" name="transition" value="{{ transition.name }}"
+                                    {% if workflow_can(object, transition.name, object.getWorkflowName()) -%}
+                                        class="btn btn-primary"
+                                    {%- else -%}
+                                        class="btn btn-danger" disabled="disabled"
+                                    {%- endif -%}
+                                >
+                                    {{ transition.name }}
+                                </a>
+                            {% endfor %}
+                        {% else %}
+                            <a  href="" name="transition" class="btn btn-danger" disabled="disabled">Sin opciones</a>
+                        {% endif %}
+                    </div>
+                <br />
+            </div>
+        </div>
+        <div>
             <br />
+            <img src="{{ app.request.schemeAndHttpHost ~ app.request.baseUrl }}/../workflows_png/{{object.getWorkflowName()}}.png?nocache={{ date().timestamp }}" />
         </div>
-    </div>
-    <div>
         <br />
-        <img src="{{ app.request.schemeAndHttpHost ~ app.request.baseUrl }}/../workflows_png/{{object.getWorkflow()}}.png?nocache={{ date().timestamp }}" />
-    </div>
-    <br />
+    {% endif %}
     <div>
         <a  href="{{path(back_route)}}" class="btn btn-primary">
             Volver al dashboard