From 8d5907e0d8af6d309ccd98dd2118cd2cd6471ec1 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 19:29:36 +0800
Subject: [PATCH] Update hub list display to show branch name on outlet form

---
 templates/outlet/form.html.twig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/outlet/form.html.twig b/templates/outlet/form.html.twig
index 73ce5f8c..e1df7a3f 100644
--- a/templates/outlet/form.html.twig
+++ b/templates/outlet/form.html.twig
@@ -24,7 +24,7 @@
                             <h3 class="m-portlet__head-text">
                                 {% if mode == 'update' %}
                                     Edit Outlet
-                                    <small>{{ obj.getName() }}</small>
+                                    <small>{{ obj.getName }}</small>
                                 {% else %}
                                     New Outlet
                                 {% endif %}
@@ -32,7 +32,7 @@
                         </div>
                     </div>
                 </div>
-                <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('outlet_update_submit', {'id': obj.getId()}) : url('outlet_create_submit') }}">
+                <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('outlet_update_submit', {'id': obj.getID}) : url('outlet_create_submit') }}">
 
                     <div class="m-portlet__body">
                         <div class="form-group m-form__group row no-border">
@@ -40,14 +40,14 @@
                                 <label for="name" data-field="name">
                                     Name
                                 </label>
-                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
+                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getName }}">
                                 <div class="form-control-feedback hide" data-field="name"></div>
                             </div>
                             <div class="col-lg-6">
                                 <label for="branch" data-field="branch">
                                     Branch
                                 </label>
-                                <input type="text" name="branch" class="form-control m-input" value="{{ obj.getBranch() }}">
+                                <input type="text" name="branch" class="form-control m-input" value="{{ obj.getBranch }}">
                                 <div class="form-control-feedback hide" data-field="branch"></div>
                             </div>
                         </div>
@@ -98,7 +98,7 @@
                                 <select class="form-control m-input" id="hub" name="hub">
                                     <option value=""></option>
                                     {% for hub in hubs %}
-                                        <option value="{{ hub.getID() }}"{{ obj.getHub() and hub.getID() == obj.getHub().getID() ? ' selected' }}>{{ hub.getName() }}</option>
+                                        <option value="{{ hub.getID }}"{{ obj.getHub and hub.getID == obj.getHub.getID ? ' selected' }}>{{ hub.getName ~ (hub.getBranch ? ' - ' ~ hub.getBranch) }}</option>
                                     {% endfor %}
                                 </select>
                                 <div class="form-control-feedback hide" data-field="hub"></div>