You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

264 lines
12 KiB

Feature: Timetracking (#2211) * Added comment's hashtag to url for mail notifications. * Added explanation to return statement + documentation. * Replacing in-line link generation with HTMLURL. (+gofmt) * Replaced action-based model with nil-based model. (+gofmt) * Replaced mailIssueActionToParticipants with mailIssueCommentToParticipants. * Updating comment for mailIssueCommentToParticipants * Added link to comment in "Dashboard" * Deleting feed entry if a comment is going to be deleted * Added migration * Added improved migration to add a CommentID column to action. * Added improved links to comments in feed entries. * Fixes #1956 by filtering for deleted comments that are referenced in actions. * Introducing "IsDeleted" column to action. * Adding design draft (not functional) * Adding database models for stopwatches and trackedtimes * See go-gitea/gitea#967 * Adding design draft (not functional) * Adding translations and improving design * Implementing stopwatch (for timetracking) * Make UI functional * Add hints in timeline for time tracking events * Implementing timetracking feature * Adding "Add time manual" option * Improved stopwatch * Created report of total spent time by user * Only showing total time spent if theire is something to show. * Adding license headers. * Improved error handling for "Add Time Manual" * Adding @sapks 's changes, refactoring * Adding API for feature tracking * Adding unit test * Adding DISABLE/ENABLE option to Repository settings page * Improving translations * Applying @sapk 's changes * Removing repo_unit and using IssuesSetting for disabling/enabling timetracker * Adding DEFAULT_ENABLE_TIMETRACKER to config, installation and admin menu * Improving documentation * Fixing vendor/ folder * Changing timtracking routes by adding subgroups /times and /times/stopwatch (Proposed by @lafriks ) * Restricting write access to timetracking based on the repo settings (Proposed by @lafriks ) * Fixed minor permissions bug. * Adding CanUseTimetracker and IsTimetrackerEnabled in ctx.Repo * Allow assignees and authors to track there time too. * Fixed some build-time-errors + logical errors. * Removing unused Get...ByID functions * Moving IsTimetrackerEnabled from context.Repository to models.Repository * Adding a seperate file for issue related repo functions * Adding license headers * Fixed GetUserByParams return 404 * Moving /users/:username/times to /repos/:username/:reponame/times/:username for security reasons * Adding /repos/:username/times to get all tracked times of the repo * Updating sdk-dependency * Updating swagger.v1.json * Adding warning if user has already a running stopwatch (auto-timetracker) * Replacing GetTrackedTimesBy... with GetTrackedTimes(options FindTrackedTimesOptions) * Changing code.gitea.io/sdk back to code.gitea.io/sdk * Correcting spelling mistake * Updating vendor.json * Changing GET stopwatch/toggle to POST stopwatch/toggle * Changing GET stopwatch/cancel to POST stopwatch/cancel * Added migration for stopwatches/timetracking * Fixed some access bugs for read-only users * Added default allow only contributors to track time value to config * Fixed migration by chaging x.Iterate to x.Find * Resorted imports * Moved Add Time Manually form to repo_form.go * Removed "Seconds" field from Add Time Manually * Resorted imports * Improved permission checking * Fixed some bugs * Added integration test * gofmt * Adding integration test by @lafriks * Added created_unix to comment fixtures * Using last event instead of a fixed event * Adding another integration test by @lafriks * Fixing bug Timetracker enabled causing error 500 at sidebar.tpl * Fixed a refactoring bug that resulted in hiding "HasUserStopwatch" warning. * Returning TrackedTime instead of AddTimeOption at AddTime. * Updating SDK from go-gitea/go-sdk#69 * Resetting Go-SDK back to default repository * Fixing test-vendor by changing ini back to original repository * Adding "tags" to swagger spec * govendor sync * Removed duplicate * Formatting templates * Adding IsTimetrackingEnabled checks to API * Improving translations / english texts * Improving documentation * Updating swagger spec * Fixing integration test caused be translation-changes * Removed encoding issues in local_en-US.ini. * "Added" copyright line * Moved unit.IssuesConfig().EnableTimetracker into a != nil check * Removed some other encoding issues in local_en-US.ini * Improved javascript by checking if data-context exists * Replaced manual comment creation with CreateComment * Removed unnecessary code * Improved error checking * Small cosmetic changes * Replaced int>string>duration parsing with int>duration parsing * Fixed encoding issues * Removed unused imports Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
Issue due date (#3794) * Started adding deadline to ui * Implemented basic issue due date managing * Improved UI for due date managing * Added at least write access to the repo in order to modify issue due dates * Ui improvements * Added issue comments creation when adding/modifying/removing a due date * Show due date in issue list * Added api support for issue due dates * Fixed lint suggestions * Added deadline to sdk * Updated css * Added support for adding/modifiying deadlines for pull requests via api * Fixed comments not created when updating or removing a deadline * update sdk (will do properly once go-gitea/go-sdk#103 is merged) * enhanced updateIssueDeadline * Removed unnessecary Issue.DeadlineString * UI improvements * Small improvments to comment creation + ui & validation improvements * Check if an issue is overdue is now a seperate function * Updated go-sdk with govendor as it was merged * Simplified isOverdue method * removed unessecary deadline to 0 set * Update swagger definitions * Added missing return * Added an explanary comment * Improved updateIssueDeadline method so it'll only update `deadline_unix` * Small changes and improvements * no need to explicitly load the issue when updating a deadline, just use whats already there * small optimisations * Added check if a deadline was modified before updating it * Moved comment creating logic into its own function * Code cleanup for creating deadline comment * locale improvement * When modifying a deadline, the old deadline is saved with the comment * small improvments to xorm session handling when updating an issue deadline + style nitpicks * style nitpicks * Moved checking for if the user has write acces to middleware
6 years ago
  1. {{range .Issue.Comments}}
  2. {{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }}
  3. <!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING, 13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE, 18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY -->
  4. {{if eq .Type 0}}
  5. <div class="comment" id="{{.HashTag}}">
  6. <a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
  7. <img src="{{.Poster.RelAvatarLink}}">
  8. </a>
  9. <div class="content">
  10. <div class="ui top attached header">
  11. <span class="text grey"><a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
  12. <div class="ui right actions">
  13. {{if gt .ShowTag 0}}
  14. <div class="item tag">
  15. {{if eq .ShowTag 1}}
  16. {{$.i18n.Tr "repo.issues.poster"}}
  17. {{else if eq .ShowTag 2}}
  18. {{$.i18n.Tr "repo.issues.collaborator"}}
  19. {{else if eq .ShowTag 3}}
  20. {{$.i18n.Tr "repo.issues.owner"}}
  21. {{end}}
  22. </div>
  23. {{end}}
  24. {{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) }}
  25. {{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}}
  26. <div class="item action">
  27. <a class="edit-content" href="#"><i class="octicon octicon-pencil"></i></a>
  28. <a class="delete-comment" href="#" data-comment-id={{.HashTag}} data-url="{{$.RepoLink}}/comments/{{.ID}}/delete" data-locale="{{$.i18n.Tr "repo.issues.delete_comment_confirm"}}"><i class="octicon octicon-x"></i></a>
  29. </div>
  30. {{end}}
  31. </div>
  32. </div>
  33. <div class="ui attached segment">
  34. <div class="render-content markdown has-emoji">
  35. {{if .RenderedContent}}
  36. {{.RenderedContent|Str2html}}
  37. {{else}}
  38. <span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span>
  39. {{end}}
  40. </div>
  41. <div class="raw-content hide">{{.Content}}</div>
  42. <div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}"></div>
  43. </div>
  44. {{$reactions := .Reactions.GroupByType}}
  45. {{if $reactions}}
  46. <div class="ui attached segment reactions">
  47. {{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions }}
  48. </div>
  49. {{end}}
  50. {{if .Attachments}}
  51. <div class="ui bottom attached segment">
  52. <div class="ui small images">
  53. {{range .Attachments}}
  54. <a target="_blank" rel="noopener noreferrer" href="{{AppSubUrl}}/attachments/{{.UUID}}">
  55. {{if FilenameIsImage .Name}}
  56. <img class="ui image" src="{{AppSubUrl}}/attachments/{{.UUID}}" title='{{$.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'>
  57. {{else}}
  58. <span class="ui image octicon octicon-desktop-download" title='{{$.i18n.Tr "repo.issues.attachment.download" .Name}}'></span>
  59. {{end}}
  60. </a>
  61. {{end}}
  62. </div>
  63. </div>
  64. {{end}}
  65. </div>
  66. </div>
  67. {{else if eq .Type 1}}
  68. <div class="event">
  69. <span class="octicon octicon-primitive-dot"></span>
  70. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  71. <img src="{{.Poster.RelAvatarLink}}">
  72. </a>
  73. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}</span>
  74. </div>
  75. {{else if eq .Type 2}}
  76. <div class="event">
  77. <span class="octicon octicon-circle-slash"></span>
  78. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  79. <img src="{{.Poster.RelAvatarLink}}">
  80. </a>
  81. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
  82. </div>
  83. {{else if eq .Type 4}}
  84. <div class="event">
  85. <span class="octicon octicon-bookmark"></span>
  86. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  87. <img src="{{.Poster.RelAvatarLink}}">
  88. </a>
  89. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>
  90. <div class="detail">
  91. <span class="octicon octicon-git-commit"></span>
  92. <span class="text grey">{{.Content | Str2html}}</span>
  93. </div>
  94. </div>
  95. {{else if eq .Type 7}}
  96. {{if .Label}}
  97. <div class="event">
  98. <span class="octicon octicon-primitive-dot"></span>
  99. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  100. <img src="{{.Poster.RelAvatarLink}}">
  101. </a>
  102. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
  103. {{if .Content}}{{$.i18n.Tr "repo.issues.add_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_label_at" .Label.ForegroundColor .Label.Color (.Label.Name|Escape) $createdStr | Safe}}{{end}}</span>
  104. </div>
  105. {{end}}
  106. {{else if eq .Type 8}}
  107. <div class="event">
  108. <span class="octicon octicon-primitive-dot"></span>
  109. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  110. <img src="{{.Poster.RelAvatarLink}}">
  111. </a>
  112. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
  113. {{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}</span>
  114. </div>
  115. {{else if eq .Type 9}}
  116. <div class="event">
  117. <span class="octicon octicon-primitive-dot"></span>
  118. {{if gt .AssigneeID 0}}
  119. {{if .RemovedAssignee}}
  120. <a class="ui avatar image" href="{{.Assignee.HomeLink}}">
  121. <img src="{{.Assignee.RelAvatarLink}}">
  122. </a>
  123. <span class="text grey">
  124. <a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a>
  125. {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}}
  126. </span>
  127. {{else}}
  128. <a class="ui avatar image" href="{{.Assignee.HomeLink}}">
  129. <img src="{{.Assignee.RelAvatarLink}}">
  130. </a>
  131. <span class="text grey">
  132. <a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a>
  133. {{if eq .Poster.ID .AssigneeID}}
  134. {{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
  135. {{else}}
  136. {{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}}
  137. {{end}}
  138. </span>
  139. {{end}}
  140. {{end}}
  141. </div>
  142. {{else if eq .Type 10}}
  143. <div class="event">
  144. <span class="octicon octicon-primitive-dot"></span>
  145. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  146. <img src="{{.Poster.RelAvatarLink}}">
  147. </a>
  148. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
  149. {{$.i18n.Tr "repo.issues.change_title_at" (.OldTitle|Escape) (.NewTitle|Escape) $createdStr | Safe}}
  150. </span>
  151. </div>
  152. {{else if eq .Type 11}}
  153. <div class="event">
  154. <span class="octicon octicon-primitive-dot"></span>
  155. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  156. <img src="{{.Poster.RelAvatarLink}}">
  157. </a>
  158. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
  159. {{$.i18n.Tr "repo.issues.delete_branch_at" (.CommitSHA|Escape) $createdStr | Safe}}
  160. </span>
  161. </div>
  162. {{else if eq .Type 12}}
  163. <div class="event">
  164. <span class="octicon octicon-primitive-dot"></span>
  165. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  166. <img src="{{.Poster.RelAvatarLink}}">
  167. </a>
  168. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.start_tracking_history" $createdStr | Safe}}</span>
  169. </div>
  170. {{else if eq .Type 13}}
  171. <div class="event">
  172. <span class="octicon octicon-primitive-dot"></span>
  173. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  174. <img src="{{.Poster.RelAvatarLink}}">
  175. </a>
  176. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}}</span>
  177. <div class="detail">
  178. <span class="octicon octicon-clock"></span>
  179. <span class="text grey">{{.Content}}</span>
  180. </div>
  181. </div>
  182. {{else if eq .Type 14}}
  183. <div class="event">
  184. <span class="octicon octicon-primitive-dot"></span>
  185. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  186. <img src="{{.Poster.RelAvatarLink}}">
  187. </a>
  188. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.add_time_history" $createdStr | Safe}}</span>
  189. <div class="detail">
  190. <span class="octicon octicon-clock"></span>
  191. <span class="text grey">{{.Content}}</span>
  192. </div>
  193. </div>
  194. {{else if eq .Type 15}}
  195. <div class="event">
  196. <span class="octicon octicon-primitive-dot"></span>
  197. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  198. <img src="{{.Poster.RelAvatarLink}}">
  199. </a>
  200. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.cancel_tracking_history" $createdStr | Safe}}</span>
  201. </div>
  202. {{else if eq .Type 16}}
  203. <div class="event">
  204. <span class="octicon octicon-primitive-dot"></span>
  205. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  206. <img src="{{.Poster.RelAvatarLink}}">
  207. </a>
  208. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
  209. {{$.i18n.Tr "repo.issues.due_date_added" .Content $createdStr | Safe}}
  210. </span>
  211. </div>
  212. {{else if eq .Type 17}}
  213. <div class="event">
  214. <span class="octicon octicon-primitive-dot"></span>
  215. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  216. <img src="{{.Poster.RelAvatarLink}}">
  217. </a>
  218. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
  219. {{$.i18n.Tr "repo.issues.due_date_modified" (.Content | ParseDeadline) $createdStr | Safe}}
  220. </span>
  221. </div>
  222. {{else if eq .Type 18}}
  223. <div class="event">
  224. <span class="octicon octicon-primitive-dot"></span>
  225. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  226. <img src="{{.Poster.RelAvatarLink}}">
  227. </a>
  228. <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
  229. {{$.i18n.Tr "repo.issues.due_date_remove" .Content $createdStr | Safe}}
  230. </span>
  231. </div>
  232. {{else if eq .Type 19}}
  233. <div class="event">
  234. <span class="octicon octicon-primitive-dot"></span>
  235. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  236. <img src="{{.Poster.RelAvatarLink}}">
  237. </a>
  238. <span class="text grey">
  239. {{$.i18n.Tr "repo.issues.dependency.added_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
  240. </span>
  241. <div class="detail">
  242. <span class="octicon octicon-plus"></span>
  243. <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
  244. </div>
  245. </div>
  246. {{else if eq .Type 20}}
  247. <div class="event">
  248. <span class="octicon octicon-primitive-dot"></span>
  249. <a class="ui avatar image" href="{{.Poster.HomeLink}}">
  250. <img src="{{.Poster.RelAvatarLink}}">
  251. </a>
  252. <span class="text grey">
  253. {{$.i18n.Tr "repo.issues.dependency.removed_dependency" .Poster.HomeLink .Poster.Name $createdStr | Safe}}
  254. </span>
  255. <div class="detail">
  256. <span class="text grey octicon octicon-trashcan"></span>
  257. <span class="text grey"><a href="{{$.RepoLink}}/issues/{{.DependentIssue.Index}}">#{{.DependentIssue.Index}} {{.DependentIssue.Title}}</a></span>
  258. </div>
  259. </div>
  260. {{end}}
  261. {{end}}