- in progress

This commit is contained in:
Matan Bar Yosef 2015-08-03 01:40:14 +03:00
parent afb9c38184
commit 5a13b3f12c
2 changed files with 11 additions and 12 deletions

View file

@ -28,6 +28,8 @@ angular.module('SeHub')
apiService.getAllUserMessages(token).success(function(data) apiService.getAllUserMessages(token).success(function(data)
{ {
$scope.displayingMessages = false; $scope.displayingMessages = false;
// for(var i = 0; i < data.length; i ++)
// if(!data.isPersonal)
$scope.projectMessages = data; $scope.projectMessages = data;
}).error(function(err) }).error(function(err)
{ {
@ -112,9 +114,6 @@ angular.module('SeHub')
'message': $scope.msg.msgToAdd, 'message': $scope.msg.msgToAdd,
'isProject': true 'isProject': true
}; };
console.log(jsonNewMsg.message);
console.log(jsonNewMsg.groupId);
console.log(jsonNewMsg.isProject);
apiService.createMessage(token, jsonNewMsg).success(function(data) apiService.createMessage(token, jsonNewMsg).success(function(data)
{ {

View file

@ -108,7 +108,7 @@
</div> </div>
<md-content class="tabDesign"> <md-content class="tabDesign">
<md-card ng-repeat = "msg in projectMessages"> <md-card ng-repeat = "msg in projectMessages">
<div layout = "row" layout-padding ng-if="!displayingMessages"> <div layout = "row" layout-padding ng-if="!displayingMessages && msg.isProject">
<div flex = "10"> <div flex = "10">
<img ng-src="{{msg.user.avatar_url}}" style="width:80%"> <img ng-src="{{msg.user.avatar_url}}" style="width:80%">
</div> </div>
@ -138,21 +138,21 @@
</tr> </tr>
<tr ng-repeat = "commit in project.info.commits" layout-margin align = "center"> <tr ng-repeat = "commit in project.info.commits" layout-margin align = "center">
<td> <td>
<span ng-repeat = "msg in commit"> <span>
<a target = "_blank"ng-href="{{commit.html_url}}" <a target = "_blank"ng-href="{{commit.html_url}}"
style="text-decoration:none; color:black;"> style="text-decoration:none; color:black;">
{{msg.message}} {{commit.commit.message}}
</a> </a>
</span> </span>
</td> </td>
<td> <td>
<span ng-repeat = "date in commit.author"> <span >
{{date.date}} {{commit.commit.committer.date}}
</span> </span>
</td> </td>
<td ng-repeat = "member in project.members"> <td >
<a ng-href="#/profile/{{member.id}}" style="text-decoration:none; color:black;"> <a ng-href="#/profile/{{member.id}}" style="text-decoration:none; color:black;">
{{member.name}} {{commit.commit.committer.name}}
</a> </a>
</td> </td>
</tr> </tr>
@ -185,7 +185,7 @@
{{issue.milestone.title}} {{issue.milestone.title}}
</td> </td>
<td> <td>
<span ng-repeat = "member in project.members"> <span>
<a ng-href = "{{getProfileRoute(issue.assignee.login)}}" style="text-decoration:none; color:black;"> <a ng-href = "{{getProfileRoute(issue.assignee.login)}}" style="text-decoration:none; color:black;">
{{issue.assignee.login}} {{issue.assignee.login}}
</a> </a>