Merge branch 'v4.4' of https://github.com/sourcefabric/Newscoop into …

…token
sourcefabric · Apr 1, 2015 · cd438b2 · cd438b2
2 parents 8076fc0 + 23340d3
commit cd438b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/controllers/playlists.js b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/controllers/playlists.js
@@ -226,7 +226,7 @@ angular.module('playlistsApp').controller('PlaylistsController', [
  isInLogList = _.some(
  Playlist.getLogList(),
  {number: number}
-  );
+ );
 
  if (!isInLogList) {
  Playlist.getArticle(number, language).then(function (article) {
@@ -306,6 +306,7 @@ angular.module('playlistsApp').controller('PlaylistsController', [
  $activityIndicator.stopAnimating();
  });
 
+ Playlist.clearLogList();
  Playlist.setListId(list.id);
  $scope.playlistInfo = list;
  $scope.playlist.selected.oldLimit = list.maxItems;

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Playlists/index.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Playlists/index.html.twig
@@ -40,9 +40,9 @@
  </div>
 
  <div class="save-button-bar">
- <button ng-click="addArticleToListFromEditor('{{ articleNumber }}', '{{ language }}')" class="btn btn-default btn-xs">{{ 'Add to list'|trans }}</button>
+ <button ng-disabled="!playlist.selected" ng-click="addArticleToListFromEditor('{{ articleNumber }}', '{{ language }}')" class="btn btn-default btn-xs">{{ 'Add to list'|trans }}</button>
  <button onclick="parent.$.fancybox.close(); parent.location.reload();" class="btn btn-default btn-xs">{{ 'Close'|trans({}, 'messages') }}</button>
- <button type="button" ng-disabled="processing" ng-click="savePlaylistInEditorMode()" name="save" class="btn btn-xs btn-primary"><span class="glyphicon glyphicon-ok"></span> {{ 'Save'|trans({}, 'messages') }}</button>
+ <button type="button" ng-disabled="processing || !playlist.selected" ng-click="savePlaylistInEditorMode()" name="save" class="btn btn-xs btn-primary"><span class="glyphicon glyphicon-ok"></span> {{ 'Save'|trans({}, 'messages') }}</button>
  </div>
  </div>
  {% endif %}
@@ -189,7 +189,7 @@
  <div loading-container="tableParams.settings().$loading">
  <table ng-table="tableParams" show-filter="true" class="table datatable dataTable">
  <tbody ng-sortable="sortableConfig">
- <tr ng-repeat="article in $data track by article.number" class="move-elements">
+ <tr ng-repeat="article in $data" class="move-elements">
  <td class="query" filter="{ 'query': 'text' }" sortable="query">
  <div class="context-item">
  <div class="context-drag-topics"><a href="#" title="drag to sort"></a></div>
@@ -248,7 +248,7 @@
  <div id="placeholder-wrapper" {% if editorView == false %}ng-class="{'empty-placeholder': $parent.featuredArticles.length == 0}" {% endif %}>
  <p>{{ 'Drag here to add to list'|trans }}</p>
  <ul id="context_list" ng-sortable="sortableConfig">
- <li class="item" ng-repeat="article in $parent.featuredArticles track by article.number">
+ <li class="item" ng-repeat="article in $parent.featuredArticles">
  <div class="context-item" {% if editorView %}style="width: 620px"{% endif %} >
  <div class="context-drag-topics"><a href="#" title="drag to sort"></a></div>
  <div class="context-item-header">