branch develop updated (4e47cc6 -> 32ed258)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 4e47cc6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new e41f78b fixes #1153 : Mauvaises informations dans le tunnel de commande new 32ed258 fixes #1154 : Erreur graphique sur le nom de projet dans le tunnel de commande, onglet Sent The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 32ed2581e242438e3c34ae1131cb224fec1a3b68 Author: kootox <jean.couteau@gmail.com> Date: Tue Jan 27 16:30:25 2015 +0100 fixes #1154 : Erreur graphique sur le nom de projet dans le tunnel de commande, onglet Sent commit e41f78bc34856dafb0bba376f6bfbca326b63a14 Author: kootox <jean.couteau@gmail.com> Date: Tue Jan 27 16:27:07 2015 +0100 fixes #1153 : Mauvaises informations dans le tunnel de commande Summary of changes: .../src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp | 2 +- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit e41f78bc34856dafb0bba376f6bfbca326b63a14 Author: kootox <jean.couteau@gmail.com> Date: Tue Jan 27 16:27:07 2015 +0100 fixes #1153 : Mauvaises informations dans le tunnel de commande --- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chorem-webmotion/src/main/webapp/js/salesFunnel.js b/chorem-webmotion/src/main/webapp/js/salesFunnel.js index 6a2ae71..102ba5c 100644 --- a/chorem-webmotion/src/main/webapp/js/salesFunnel.js +++ b/chorem-webmotion/src/main/webapp/js/salesFunnel.js @@ -62,21 +62,21 @@ var salesFunnelController = ['$scope', '$modal', 'Wikitty', function ($scope, $m if (i != "$promise" && i != "$resolved" && i != "length") { var categoryId = w[i].getField('Quotation','category'); Wikitty.get(categoryId, function(cat){ - $scope.dependencies[categoryId]=cat; + $scope.dependencies[cat.getId()]=cat; }); var customerId = w[i].getField('Quotation','customer'); Wikitty.get(customerId, function(cust){ - $scope.dependencies[customerId]=cust; + $scope.dependencies[cust.getId()]=cust; var customerCompanyId = cust.getField('Employee','company'); Wikitty.get(customerCompanyId, function(comp){ - $scope.dependencies[customerCompanyId]=comp; + $scope.dependencies[comp.getId()]=comp; }); }); var projectId = w[i].getField('Quotation','project'); Wikitty.get(projectId, function(project){ - $scope.dependencies[projectId]=project; + $scope.dependencies[project.getId()]=project; }); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit 32ed2581e242438e3c34ae1131cb224fec1a3b68 Author: kootox <jean.couteau@gmail.com> Date: Tue Jan 27 16:30:25 2015 +0100 fixes #1154 : Erreur graphique sur le nom de projet dans le tunnel de commande, onglet Sent --- .../src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp index 811ecb7..0897f00 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp @@ -111,7 +111,7 @@ <a href="../wikitty/edit/{{sent.meta.id}}"/><i class="glyphicon glyphicon-edit"></i></a> <small><a href="../wikitty/Employee/view/{{sent.getField('Quotation', 'customer')}}">{{dependencies[dependencies[sent.getField('Quotation','customer')].getField('Employee','company')].getField('Company','name')}}</a><span ng-hide="!sent.getField('Sent','postedDate')"> - Répondu le:{{sent.getField('Sent','postedDate') | date:'dd/MM/yyyy'}}</span></a></small> <p> - <span> + <span class="salesFunnelItemTitle"> <a class="name-link" href="../wikitty/Project/view/{{sent.getField('Quotation','project')}}"/>{{dependencies[sent.getField('Quotation','project')].getField('Project','name')}}</a> </span> - <small>{{sent.getField('Quotation','description')}}</small> </p> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm