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

Task interaction fixes (#8306)

Browse Source 
* Fixed interacting with a broken challenge

* Added fix for users using open tasks in edit mode
This commit is contained in:
Keith Holliday
2016-12-22 11:40:00 -06:00
committed by GitHub
parent afacd3e1cf
commit 2da0a1e88c
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client-old/js/controllers/tasksCtrl.js
View File

@@ -42,6 +42,11 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
User.addTask({ User.addTask({
body: tasks, body: tasks,
}); });
if (User.user.preferences.newTaskEdit) {
var taskToEdit = tasks[tasks.length -1];
$scope.editTask(taskToEdit, User.user, Shared.taskClasses(taskToEdit, User.user.filters, User.user.preferences.dayStart, User.user.lastCron, listDef.showCompleted, main));
}
} }
$scope.addTask = function(listDef) { $scope.addTask = function(listDef) {

2
website/client-old/js/services/taskServices.js
View File

@@ -266,6 +266,8 @@ angular.module('habitrpg')
modalScope.canEdit = scopeInc.canEdit; modalScope.canEdit = scopeInc.canEdit;
modalScope.updateTaskTags = scopeInc.updateTaskTags; modalScope.updateTaskTags = scopeInc.updateTaskTags;
modalScope.obj = scopeInc.obj; modalScope.obj = scopeInc.obj;
modalScope.unlink = scopeInc.unlink;
modalScope.removeTask = scopeInc.removeTask;
} }
modalScope.cancelTaskEdit = cancelTaskEdit; modalScope.cancelTaskEdit = cancelTaskEdit;

16
website/views/shared/tasks/edit/index.jade
View File

@@ -7,30 +7,30 @@ div(ng-if='task._editing')
div(ng-if='task.challenge.broken=="TASK_DELETED" || task.challenge.broken=="CHALLENGE_TASK_NOT_FOUND"') div(ng-if='task.challenge.broken=="TASK_DELETED" || task.challenge.broken=="CHALLENGE_TASK_NOT_FOUND"')
p=env.t('brokenTask') p=env.t('brokenTask')
p p
a(ng-click='unlink(task, "keep")')=env.t('keepIt') a(ng-click='unlink(task, "keep"); $close()')=env.t('keepIt')
|    |   
a(ng-click="removeTask(task, obj)")=env.t('removeIt') a(ng-click="removeTask(task, obj); $close()")=env.t('removeIt')
div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"') div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"')
p p
|  | 
=env.t('brokenChallenge') =env.t('brokenChallenge')
p p
a(ng-click='unlink(task, "keep-all")')=env.t('keepThem') a(ng-click='unlink(task, "keep-all"); $close()')=env.t('keepThem')
|  |  |  | 
a(ng-click='unlink(task, "remove-all")')=env.t('removeThem') a(ng-click='unlink(task, "remove-all"); $close()')=env.t('removeThem')
div(ng-if='task.challenge.broken=="CHALLENGE_CLOSED"') div(ng-if='task.challenge.broken=="CHALLENGE_CLOSED"')
p p
!=env.t('challengeCompleted', {user: "{{task.challenge.winner}}"}) !=env.t('challengeCompleted', {user: "{{task.challenge.winner}}"})
p p
a(ng-click='unlink(task, "keep-all")')=env.t('keepThem') a(ng-click='unlink(task, "keep-all"); $close()')=env.t('keepThem')
|  |  |  | 
a(ng-click='unlink(task, "remove-all")')=env.t('removeThem') a(ng-click='unlink(task, "remove-all"); $close()')=env.t('removeThem')
//div(ng-if='task.challenge.broken=="UNSUBSCRIBED"') //div(ng-if='task.challenge.broken=="UNSUBSCRIBED"')
p=env.t('unsubChallenge') p=env.t('unsubChallenge')
p p
a(ng-click="unlink(task, 'keep-all')")=env.t('keepThem') a(ng-click="unlink(task, 'keep-all'); $close()")=env.t('keepThem')
|  |  |  | 
a(ng-click="unlink(task, 'remove-all')")=env.t('removeThem') a(ng-click="unlink(task, 'remove-all'); $close()")=env.t('removeThem')
include ./checklist include ./checklist

7
website/views/shared/tasks/meta_controls.jade
View File

@@ -37,6 +37,7 @@
|   |  
span.glyphicon.glyphicon-pencil(ng-hide='task._editing') span.glyphicon.glyphicon-pencil(ng-hide='task._editing')
|   |  
a(ng-hide='!task._editing', ng-click='cancelTaskEdit(task)', tooltip=env.t('cancel')) a(ng-hide='!task._editing', ng-click='cancelTaskEdit(task)', tooltip=env.t('cancel'))
span.glyphicon.glyphicon-remove(ng-hide='!task._editing') span.glyphicon.glyphicon-remove(ng-hide='!task._editing')
|   |  
@@ -45,18 +46,18 @@
a(ng-hide='!task._editing', ng-click='saveTask(task)', tooltip=env.t('save')) a(ng-hide='!task._editing', ng-click='saveTask(task)', tooltip=env.t('save'))
span.glyphicon.glyphicon-ok(ng-hide='!task._editing') span.glyphicon.glyphicon-ok(ng-hide='!task._editing')
|   |  
//challenges //challenges
span(ng-if='task.challenge.id') span(ng-if='task.challenge.id')
span(ng-if='task.challenge.broken') span(ng-if='task.challenge.broken')
a.glyphicon.glyphicon-bullhorn(style='background-color:red;', ng-click='task._editing = true', tooltip=env.t('brokenChaLink') tooltip-placement='right') a.glyphicon.glyphicon-bullhorn(style='background-color:red;', ng-click='editTask(task, user, Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main))', tooltip=env.t('brokenChaLink') tooltip-placement='right')
|   |  
span(ng-if='!task.challenge.broken') span(ng-if='!task.challenge.broken')
span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge')) span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge'))
|   |  
// delete // delete
a(ng-if='!task.challenge.id || obj.leader._id === User.user._id', ng-hide="(checkGroupAccess && !checkGroupAccess(obj))" ng-click='removeTask(task, obj)', tooltip=env.t('delete')) a(ng-if='!task.challenge.id', ng-hide="(checkGroupAccess && !checkGroupAccess(obj))" ng-click='removeTask(task, obj)', tooltip=env.t('delete'))
span.glyphicon.glyphicon-trash span.glyphicon.glyphicon-trash
|   |