Просмотр исходного кода

Show archive heading if archiving and on OL

Alasdair Smith 8 лет назад
Родитель
Сommit
5836c029c8

+ 1 - 0
services/web/app/views/project/list/modals.pug

@@ -192,6 +192,7 @@ script(type='text/ng-template', id='deleteProjectsModalTemplate')
 			ng-click="cancel()"
 			ng-click="cancel()"
 		) ×
 		) ×
 		h3(ng-if="action == 'delete'") #{translate("delete_projects")}
 		h3(ng-if="action == 'delete'") #{translate("delete_projects")}
+		h3(ng-if="action == 'archive'") #{translate("archive_projects")}
 		h3(ng-if="action == 'leave'") #{translate("leave_projects")}
 		h3(ng-if="action == 'leave'") #{translate("leave_projects")}
 		h3(ng-if="action == 'delete-and-leave'") #{translate("delete_and_leave_projects")}
 		h3(ng-if="action == 'delete-and-leave'") #{translate("delete_and_leave_projects")}
 	.modal-body
 	.modal-body

+ 6 - 1
services/web/public/coffee/main/project-list/modal-controllers.coffee

@@ -102,10 +102,15 @@ define [
 		$scope.projectsToDelete = projects.filter (project) -> project.accessLevel == "owner"
 		$scope.projectsToDelete = projects.filter (project) -> project.accessLevel == "owner"
 		$scope.projectsToLeave = projects.filter (project) -> project.accessLevel != "owner"
 		$scope.projectsToLeave = projects.filter (project) -> project.accessLevel != "owner"
 
 
+
 		if $scope.projectsToLeave.length > 0 and $scope.projectsToDelete.length > 0
 		if $scope.projectsToLeave.length > 0 and $scope.projectsToDelete.length > 0
 			$scope.action = "delete-and-leave"
 			$scope.action = "delete-and-leave"
 		else if $scope.projectsToLeave.length == 0 and $scope.projectsToDelete.length > 0
 		else if $scope.projectsToLeave.length == 0 and $scope.projectsToDelete.length > 0
-			$scope.action = "delete"
+			projectsToArchive = $scope.projectsToDelete.filter (project) -> !project.archived
+			if projectsToArchive.length > 0 and window.ExposedSettings.isOverleaf
+				$scope.action = "archive"
+			else
+				$scope.action = "delete"
 		else
 		else
 			$scope.action = "leave"
 			$scope.action = "leave"