krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Put list back into removeTask function, update removal logic within challengeCtrl

Browse Source
This commit is contained in:
Kevin Gisi
2015-04-08 23:03:45 -04:00
parent f12d56e456
commit 860ca9fc16
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/public/js/controllers/challengesCtrl.js
View File

@@ -58,7 +58,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
var groupsWithChallenges = _.uniq(_.pluck($scope.groupsFilter, '_id')); var groupsWithChallenges = _.uniq(_.pluck($scope.groupsFilter, '_id'));
var len = groupsWithChallenges.length; var len = groupsWithChallenges.length;
var filterCount = 0; var filterCount = 0;
for ( var i = 0; i < len; i += 1 ) { for ( var i = 0; i < len; i += 1 ) {
if ( $scope.search.group[groupsWithChallenges[i]] == true ) { if ( $scope.search.group[groupsWithChallenges[i]] == true ) {
filterCount += 1; filterCount += 1;
@@ -186,11 +186,11 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
delete listDef.newTask; delete listDef.newTask;
}; };
$scope.removeTask = function(list, $index) { $scope.removeTask = function(task, list) {
if (!confirm(window.env.t('sureDelete'))) return; if (!confirm(window.env.t('sureDelete'))) return;
//TODO persist //TODO persist
// User.log({op: "delTask", data: task}); // User.log({op: "delTask", data: task});
list.splice($index, 1); _.remove(list, task);
}; };
$scope.saveTask = function(task){ $scope.saveTask = function(task){

4
website/views/shared/tasks/task.jade
View File

@@ -44,7 +44,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge')) span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge'))
| &nbsp; | &nbsp;
// delete // delete
a(ng-if='!task.challenge.id', ng-click='removeTask(task)', tooltip=env.t('delete')) a(ng-if='!task.challenge.id', ng-click='removeTask(task, obj[list.type+"s"])', tooltip=env.t('delete'))
span.glyphicon.glyphicon-trash span.glyphicon.glyphicon-trash
| &nbsp; | &nbsp;
@@ -101,7 +101,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
p p
a(ng-click='unlink(task, "keep")')=env.t('keepIt') a(ng-click='unlink(task, "keep")')=env.t('keepIt')
| &nbsp;&nbsp; | &nbsp;&nbsp;
a(ng-click="removeTask(task)")=env.t('removeIt') a(ng-click='removeTask(task, obj[list.type+"s"])')=env.t('removeIt')
div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"') div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"')
p p
|&nbsp; |&nbsp;