Download as
Browse Code »

Commit 395f5ad9a93423fba1be490c3954b16066b9282e

Authored by Caio Almeida
1 parent d512df59
Exists in master and in 2 other branches production, staging

Display proposal author on proposal list and single proposal view

Showing 3 changed files with 11 additions and 3 deletions   Show diff stats
ConfJuvApp/www/html/_proposal.html
  Diff comments   View file @395f5ad
1 <div id="proposal" class="modal"> 1 <div id="proposal" class="modal">
2 <ion-content> 2 <ion-content>
3 <h1 class="title"> 3 <h1 class="title">
4 - <span>{{proposal.title}}</span> 4 + <span>
  5 + {{proposal.title}}
  6 + <br />
  7 + <small>Autor: {{proposal.author.name}}</small>
  8 + </span>
5 <a class="back icon-left ion-reply" ng-click="closeProposal()">Voltar</a> 9 <a class="back icon-left ion-reply" ng-click="closeProposal()">Voltar</a>
6 </h1> 10 </h1>
7 <button class="button report-abuse" ng-click="openReportAbuseForm()"> 11 <button class="button report-abuse" ng-click="openReportAbuseForm()">
ConfJuvApp/www/html/_proposal_list.html
  Diff comments   View file @395f5ad
@@ -5,7 +5,11 @@ @@ -5,7 +5,11 @@
5 <td-card ng-repeat="proposal in cards" on-destroy="cardDestroyed($index)" ng-style="{top: {{$index * 3}} + 'px'}" 5 <td-card ng-repeat="proposal in cards" on-destroy="cardDestroyed($index)" ng-style="{top: {{$index * 3}} + 'px'}"
6 on-swipe-left="" on-swipe-right="" on-partial-swipe="cardPartialSwipe(amt)"> 6 on-swipe-left="" on-swipe-right="" on-partial-swipe="cardPartialSwipe(amt)">
7 <div class="card animate-show" ng-show="proposal.topic.selected"> 7 <div class="card animate-show" ng-show="proposal.topic.selected">
8 - <h3>{{proposal.title}}</h3> 8 + <h3>
  9 + {{proposal.title}}
  10 + <br />
  11 + <small>Autor: {{proposal.author.name}}</small>
  12 + </h3>
9 <div class="card-body"> 13 <div class="card-body">
10 <!-- <div ng-bind-html="discussion.body"></div> --> 14 <!-- <div ng-bind-html="discussion.body"></div> -->
11 {{proposal.body | htmlToPlainText | limitTo:280}}... 15 {{proposal.body | htmlToPlainText | limitTo:280}}...
ConfJuvApp/www/js/controllers.js
  Diff comments   View file @395f5ad
@@ -295,7 +295,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, []) @@ -295,7 +295,7 @@ angular.module(&#39;confjuvapp.controllers&#39;, [])
295 295
296 $scope.loadProposals = function(token, topic) { 296 $scope.loadProposals = function(token, topic) {
297 $scope.loading = true; 297 $scope.loading = true;
298 - var params = '?private_token=' + token + '&fields=title,image,body,abstract,id,tag_list&content_type=ProposalsDiscussionPlugin::Proposal'; 298 + var params = '?private_token=' + token + '&fields=title,image,body,abstract,id,tag_list,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
299 var path = 'articles/' + topic.id + '/children' + params; 299 var path = 'articles/' + topic.id + '/children' + params;
300 300
301 $http.get(ConfJuvAppUtils.pathTo(path)) 301 $http.get(ConfJuvAppUtils.pathTo(path))