taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #490 from taigaio/issue/2526/close-editable-fields-after-object-update 

close description and subject fields if they are open after a change
stable
David Barragán Merino 2015-06-03 15:20:35 +02:00
parent c349614651 d0fe5d69cd
commit ededcee980
8 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/coffee/modules/common/components.coffee
View File

@ -220,7 +220,7 @@ WatchersDirective = ($rootscope, $confirm, $repo, $qqueue, $template, $compile,
$confirm.notify("success") $confirm.notify("success")
watchers = _.map(watchers, (watcherId) -> $scope.usersById[watcherId]) watchers = _.map(watchers, (watcherId) -> $scope.usersById[watcherId])
renderWatchers(watchers) renderWatchers(watchers)
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
promise.then null, -> promise.then null, ->
$model.$modelValue.revert() $model.$modelValue.revert()
@ -235,7 +235,7 @@ WatchersDirective = ($rootscope, $confirm, $repo, $qqueue, $template, $compile,
$confirm.notify("success") $confirm.notify("success")
watchers = _.map(item.watchers, (watcherId) -> $scope.usersById[watcherId]) watchers = _.map(item.watchers, (watcherId) -> $scope.usersById[watcherId])
renderWatchers(watchers) renderWatchers(watchers)
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
promise.then null, -> promise.then null, ->
item.revert() item.revert()
$confirm.notify("error") $confirm.notify("error")
@ -321,7 +321,7 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $qqueue, $template
$loading.finish($el) $loading.finish($el)
$confirm.notify("success") $confirm.notify("success")
renderAssignedTo($model.$modelValue) renderAssignedTo($model.$modelValue)
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
promise.then null, -> promise.then null, ->
$model.$modelValue.revert() $model.$modelValue.revert()
$confirm.notify("error") $confirm.notify("error")
@ -474,6 +474,10 @@ EditableSubjectDirective = ($rootscope, $repo, $confirm, $loading, $qqueue, $tem
link = ($scope, $el, $attrs, $model) -> link = ($scope, $el, $attrs, $model) ->
$scope.$on "object:updated", () ->
$el.find('.edit-subject').hide()
$el.find('.view-subject').show()
isEditable = -> isEditable = ->
return $scope.project.my_permissions.indexOf($attrs.requiredPerm) != -1 return $scope.project.my_permissions.indexOf($attrs.requiredPerm) != -1
@ -485,7 +489,7 @@ EditableSubjectDirective = ($rootscope, $repo, $confirm, $loading, $qqueue, $tem
promise = $repo.save($model.$modelValue) promise = $repo.save($model.$modelValue)
promise.then -> promise.then ->
$confirm.notify("success") $confirm.notify("success")
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
$el.find('.edit-subject').hide() $el.find('.edit-subject').hide()
$el.find('.view-subject').show() $el.find('.view-subject').show()
promise.then null, -> promise.then null, ->
@ -553,6 +557,10 @@ EditableDescriptionDirective = ($rootscope, $repo, $confirm, $compile, $loading,
$el.find('.edit-description').hide() $el.find('.edit-description').hide()
$el.find('.view-description .edit').hide() $el.find('.view-description .edit').hide()
$scope.$on "object:updated", () ->
$el.find('.edit-description').hide()
$el.find('.view-description').show()
isEditable = -> isEditable = ->
return $scope.project.my_permissions.indexOf($attrs.requiredPerm) != -1 return $scope.project.my_permissions.indexOf($attrs.requiredPerm) != -1
@ -563,7 +571,7 @@ EditableDescriptionDirective = ($rootscope, $repo, $confirm, $compile, $loading,
promise = $repo.save($model.$modelValue) promise = $repo.save($model.$modelValue)
promise.then -> promise.then ->
$confirm.notify("success") $confirm.notify("success")
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
$el.find('.edit-description').hide() $el.find('.edit-description').hide()
$el.find('.view-description').show() $el.find('.view-description').show()
promise.then null, -> promise.then null, ->

2
app/coffee/modules/common/estimation.coffee
View File

@ -92,7 +92,7 @@ UsEstimationDirective = ($tgEstimationsService, $rootScope, $repo, $confirm, $qq
estimationProcess = $tgEstimationsService.create($el, us, $scope.project) estimationProcess = $tgEstimationsService.create($el, us, $scope.project)
estimationProcess.onSelectedPointForRole = (roleId, pointId) -> estimationProcess.onSelectedPointForRole = (roleId, pointId) ->
@save(roleId, pointId).then -> @save(roleId, pointId).then ->
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
estimationProcess.render = () -> estimationProcess.render = () ->
ctx = { ctx = {

2
app/coffee/modules/common/history.coffee
View File

@ -371,7 +371,7 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
$scope.$watch("comments", renderComments) $scope.$watch("comments", renderComments)
$scope.$watch("history", renderActivity) $scope.$watch("history", renderActivity)
$scope.$on("history:reload", -> $ctrl.loadHistory(type, objectId)) $scope.$on("object:updated", -> $ctrl.loadHistory(type, objectId))
# Events # Events

4
app/coffee/modules/common/lightboxes.coffee
View File

@ -161,7 +161,7 @@ BlockLightboxDirective = ($rootscope, $tgrepo, $confirm, lightboxService, $loadi
promise = $tgrepo.save(item) promise = $tgrepo.save(item)
promise.then -> promise.then ->
$confirm.notify("success") $confirm.notify("success")
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
$model.$setViewValue(item) $model.$setViewValue(item)
finishCallback() finishCallback()
@ -183,7 +183,7 @@ BlockLightboxDirective = ($rootscope, $tgrepo, $confirm, lightboxService, $loadi
promise = $tgrepo.save($model.$modelValue) promise = $tgrepo.save($model.$modelValue)
promise.then -> promise.then ->
$confirm.notify("success") $confirm.notify("success")
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
promise.then null, -> promise.then null, ->
$confirm.notify("error") $confirm.notify("error")

4
app/coffee/modules/common/tags.coffee
View File

@ -285,7 +285,7 @@ TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template, $compi
$model.$setViewValue(model) $model.$setViewValue(model)
onSuccess = -> onSuccess = ->
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
onError = -> onError = ->
$confirm.notify("error") $confirm.notify("error")
model.revert() model.revert()
@ -306,7 +306,7 @@ TagLineDirective = ($rootScope, $repo, $rs, $confirm, $qqueue, $template, $compi
$model.$setViewValue(model) $model.$setViewValue(model)
onSuccess = -> onSuccess = ->
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
onError = -> onError = ->
$confirm.notify("error") $confirm.notify("error")
model.revert() model.revert()

18
app/coffee/modules/issues/detail.coffee
View File

@ -68,22 +68,22 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
initializeEventHandlers: -> initializeEventHandlers: ->
@scope.$on "attachment:create", => @scope.$on "attachment:create", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@analytics.trackEvent("attachment", "create", "create attachment on issue", 1) @analytics.trackEvent("attachment", "create", "create attachment on issue", 1)
@scope.$on "attachment:edit", => @scope.$on "attachment:edit", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "attachment:delete", => @scope.$on "attachment:delete", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "promote-issue-to-us:success", => @scope.$on "promote-issue-to-us:success", =>
@analytics.trackEvent("issue", "promoteToUserstory", "promote issue to userstory", 1) @analytics.trackEvent("issue", "promoteToUserstory", "promote issue to userstory", 1)
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@.loadIssue() @.loadIssue()
@scope.$on "custom-attributes-values:edit", => @scope.$on "custom-attributes-values:edit", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
initializeOnDeleteGoToUrl: -> initializeOnDeleteGoToUrl: ->
ctx = {project: @scope.project.slug} ctx = {project: @scope.project.slug}
@ -225,7 +225,7 @@ IssueStatusButtonDirective = ($rootScope, $repo, $confirm, $loading, $qqueue, $t
onSuccess = -> onSuccess = ->
$confirm.notify("success") $confirm.notify("success")
$model.$setViewValue(issue) $model.$setViewValue(issue)
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
$loading.finish($el.find(".level-name")) $loading.finish($el.find(".level-name"))
onError = -> onError = ->
$confirm.notify("error") $confirm.notify("error")
@ -309,7 +309,7 @@ IssueTypeButtonDirective = ($rootScope, $repo, $confirm, $loading, $qqueue, $tem
onSuccess = -> onSuccess = ->
$confirm.notify("success") $confirm.notify("success")
$model.$setViewValue(issue) $model.$setViewValue(issue)
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
$loading.finish($el.find(".level-name")) $loading.finish($el.find(".level-name"))
onError = -> onError = ->
@ -395,7 +395,7 @@ IssueSeverityButtonDirective = ($rootScope, $repo, $confirm, $loading, $qqueue,
onSuccess = -> onSuccess = ->
$confirm.notify("success") $confirm.notify("success")
$model.$setViewValue(issue) $model.$setViewValue(issue)
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
$loading.finish($el.find(".level-name")) $loading.finish($el.find(".level-name"))
onError = -> onError = ->
$confirm.notify("error") $confirm.notify("error")
@ -482,7 +482,7 @@ IssuePriorityButtonDirective = ($rootScope, $repo, $confirm, $loading, $qqueue,
onSuccess = -> onSuccess = ->
$confirm.notify("success") $confirm.notify("success")
$model.$setViewValue(issue) $model.$setViewValue(issue)
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
$loading.finish($el.find(".level-name")) $loading.finish($el.find(".level-name"))
onError = -> onError = ->
$confirm.notify("error") $confirm.notify("error")

12
app/coffee/modules/tasks/detail.coffee
View File

@ -65,13 +65,13 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
initializeEventHandlers: -> initializeEventHandlers: ->
@scope.$on "attachment:create", => @scope.$on "attachment:create", =>
@analytics.trackEvent("attachment", "create", "create attachment on task", 1) @analytics.trackEvent("attachment", "create", "create attachment on task", 1)
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "attachment:edit", => @scope.$on "attachment:edit", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "attachment:delete", => @scope.$on "attachment:delete", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "custom-attributes-values:edit", => @scope.$on "custom-attributes-values:edit", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
initializeOnDeleteGoToUrl: -> initializeOnDeleteGoToUrl: ->
ctx = {project: @scope.project.slug} ctx = {project: @scope.project.slug}
@ -237,7 +237,7 @@ TaskStatusButtonDirective = ($rootScope, $repo, $confirm, $loading, $qqueue, $co
onSuccess = -> onSuccess = ->
$confirm.notify("success") $confirm.notify("success")
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
$loading.finish($el.find(".level-name")) $loading.finish($el.find(".level-name"))
onError = -> onError = ->
@ -322,7 +322,7 @@ TaskIsIocaineButtonDirective = ($rootscope, $tgrepo, $confirm, $loading, $qqueue
promise.then -> promise.then ->
$confirm.notify("success") $confirm.notify("success")
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
promise.then null, -> promise.then null, ->
task.revert() task.revert()

15
app/coffee/modules/userstories/detail.coffee
View File

@ -71,16 +71,16 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
@scope.$on "attachment:create", => @scope.$on "attachment:create", =>
@analytics.trackEvent("attachment", "create", "create attachment on userstory", 1) @analytics.trackEvent("attachment", "create", "create attachment on userstory", 1)
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "attachment:edit", => @scope.$on "attachment:edit", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "attachment:delete", => @scope.$on "attachment:delete", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
@scope.$on "custom-attributes-values:edit", => @scope.$on "custom-attributes-values:edit", =>
@rootscope.$broadcast("history:reload") @rootscope.$broadcast("object:updated")
initializeOnDeleteGoToUrl: -> initializeOnDeleteGoToUrl: ->
ctx = {project: @scope.project.slug} ctx = {project: @scope.project.slug}
@ -297,6 +297,7 @@ UsStatusButtonDirective = ($rootScope, $repo, $confirm, $loading, $qqueue, $temp
save = $qqueue.bindAdd (status) => save = $qqueue.bindAdd (status) =>
us = $model.$modelValue.clone() us = $model.$modelValue.clone()
us.status = status us.status = status
$.fn.popover().closeAll() $.fn.popover().closeAll()
@ -305,7 +306,7 @@ UsStatusButtonDirective = ($rootScope, $repo, $confirm, $loading, $qqueue, $temp
onSuccess = -> onSuccess = ->
$confirm.notify("success") $confirm.notify("success")
$rootScope.$broadcast("history:reload") $rootScope.$broadcast("object:updated")
$loading.finish($el.find(".level-name")) $loading.finish($el.find(".level-name"))
onError = -> onError = ->
@ -387,7 +388,7 @@ UsTeamRequirementButtonDirective = ($rootscope, $tgrepo, $confirm, $loading, $qq
promise = $tgrepo.save($model.$modelValue) promise = $tgrepo.save($model.$modelValue)
promise.then => promise.then =>
$loading.finish($el.find("label")) $loading.finish($el.find("label"))
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
promise.then null, -> promise.then null, ->
$loading.finish($el.find("label")) $loading.finish($el.find("label"))
@ -449,7 +450,7 @@ UsClientRequirementButtonDirective = ($rootscope, $tgrepo, $confirm, $loading, $
promise = $tgrepo.save($model.$modelValue) promise = $tgrepo.save($model.$modelValue)
promise.then => promise.then =>
$loading.finish($el.find("label")) $loading.finish($el.find("label"))
$rootscope.$broadcast("history:reload") $rootscope.$broadcast("object:updated")
promise.then null, -> promise.then null, ->
$loading.finish($el.find("label")) $loading.finish($el.find("label"))
$confirm.notify("error") $confirm.notify("error")