Working on time tracker

This commit is contained in:
Hillel Coren 2017-09-18 12:50:42 +03:00
parent 068c8c8a13
commit d50dc6f3e6

View File

@ -139,8 +139,9 @@
<h4 class="list-group-item-heading" data-bind="text: description"></h4> <h4 class="list-group-item-heading" data-bind="text: description"></h4>
<p class="list-group-item-text"> <p class="list-group-item-text">
<span class="link" data-bind="text: clientName, click: $parent.viewClient, clickBubble: false"></span> <span class="link" data-bind="text: clientName, click: $parent.viewClient, clickBubble: false"></span>
<span data-bind="visible: clientName &amp;&amp; projectName &amp;&amp; project.name"> | </span> <span data-bind="visible: clientName &amp;&amp; projectName"> | </span>
<span class="link" data-bind="text: projectName, click: $parent.viewProject, clickBubble: false"></span> <span class="link" data-bind="text: projectName, click: $parent.viewProject, clickBubble: false"></span>
&nbsp;
</p> </p>
</a> </a>
</div> </div>
@ -626,8 +627,8 @@
$('input[name=project_name]').val(projectName); $('input[name=project_name]').val(projectName);
} else if (projectId) { } else if (projectId) {
var project = projectMap[projectId]; var project = projectMap[projectId];
model.selectedTask().project_id(projectId);
model.selectedTask().project = new ProjectModel(project); model.selectedTask().project = new ProjectModel(project);
model.selectedTask().project_id(projectId);
// when selecting a project make sure the client is loaded // when selecting a project make sure the client is loaded
if (project && project.client) { if (project && project.client) {
var client = clientMap[project.client.public_id]; var client = clientMap[project.client.public_id];