From 3bb563ec55cd239822962c2e3b2edddd890ec61d Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Sun, 8 Jun 2014 16:17:16 +0100
Subject: [PATCH] Modified the 'listview' view + controller - added `isTrashed`
 property/state

---
 .../src/views/propertyeditors/listview/listview.controller.js | 3 ++-
 .../src/views/propertyeditors/listview/listview.html          | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 8a765bb0f6..58c311f23f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -22,7 +22,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
         $scope.entityType = "content";
     }
 
-    $scope.isNew = false;    
+    $scope.isNew = false;
     $scope.actionInProgress = false;
     $scope.listViewResultSet = {
         totalPages: 0,
@@ -241,6 +241,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
         $scope.reloadView($routeParams.id);
 
         $scope.contentId = $routeParams.id;
+        $scope.isTrashed = $routeParams.id === "-20" || $routeParams.id === "-21";
 
     }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 01ed21d42f..b81617c7f8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -23,12 +23,12 @@
                 </ul>
             </div>
             
-            <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content'">
+            <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content' && !isTrashed">
                 <a class="btn btn-success" ng-disabled="actionInProgress" ng-click="publish()" prevent-default>
                     <localize key="actions_publish">Publish</localize>
                 </a>
             </div>
-            <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content'">
+            <div class="btn-group" ng-show="isAnythingSelected()" ng-if="entityType === 'content' && !isTrashed">
                 <a class="btn btn-warning" ng-disabled="actionInProgress" ng-click="unpublish()" prevent-default>
                     <localize key="actions_unpublish">Unpublish</localize>
                 </a>