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.

256 lines
6.5 KiB

10 years ago
10 years ago
10 years ago
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
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
6 years ago
10 years ago
10 years ago
9 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
  1. // Copyright 2014 The Gogs Authors. All rights reserved.
  2. // Copyright 2018 The Gitea Authors. All rights reserved.
  3. // Use of this source code is governed by a MIT-style
  4. // license that can be found in the LICENSE file.
  5. package models
  6. import (
  7. "database/sql"
  8. "errors"
  9. "fmt"
  10. "code.gitea.io/gitea/modules/setting"
  11. // Needed for the MySQL driver
  12. _ "github.com/go-sql-driver/mysql"
  13. "xorm.io/core"
  14. "xorm.io/xorm"
  15. // Needed for the Postgresql driver
  16. _ "github.com/lib/pq"
  17. // Needed for the MSSSQL driver
  18. _ "github.com/denisenkom/go-mssqldb"
  19. )
  20. // Engine represents a xorm engine or session.
  21. type Engine interface {
  22. Table(tableNameOrBean interface{}) *xorm.Session
  23. Count(...interface{}) (int64, error)
  24. Decr(column string, arg ...interface{}) *xorm.Session
  25. Delete(interface{}) (int64, error)
  26. Exec(...interface{}) (sql.Result, error)
  27. Find(interface{}, ...interface{}) error
  28. Get(interface{}) (bool, error)
  29. ID(interface{}) *xorm.Session
  30. In(string, ...interface{}) *xorm.Session
  31. Incr(column string, arg ...interface{}) *xorm.Session
  32. Insert(...interface{}) (int64, error)
  33. InsertOne(interface{}) (int64, error)
  34. Iterate(interface{}, xorm.IterFunc) error
  35. Join(joinOperator string, tablename interface{}, condition string, args ...interface{}) *xorm.Session
  36. SQL(interface{}, ...interface{}) *xorm.Session
  37. Where(interface{}, ...interface{}) *xorm.Session
  38. Asc(colNames ...string) *xorm.Session
  39. }
  40. var (
  41. x *xorm.Engine
  42. tables []interface{}
  43. // HasEngine specifies if we have a xorm.Engine
  44. HasEngine bool
  45. )
  46. func init() {
  47. tables = append(tables,
  48. new(User),
  49. new(PublicKey),
  50. new(AccessToken),
  51. new(Repository),
  52. new(DeployKey),
  53. new(Collaboration),
  54. new(Access),
  55. new(Upload),
  56. new(Watch),
  57. new(Star),
  58. new(Follow),
  59. new(Action),
  60. new(Issue),
  61. new(PullRequest),
  62. new(Comment),
  63. new(Attachment),
  64. new(Label),
  65. new(IssueLabel),
  66. new(Milestone),
  67. new(Mirror),
  68. new(Release),
  69. new(LoginSource),
  70. new(Webhook),
  71. new(HookTask),
  72. new(Team),
  73. new(OrgUser),
  74. new(TeamUser),
  75. new(TeamRepo),
  76. new(Notice),
  77. new(EmailAddress),
  78. new(Notification),
  79. new(IssueUser),
  80. new(LFSMetaObject),
  81. new(TwoFactor),
  82. new(GPGKey),
  83. new(GPGKeyImport),
  84. new(RepoUnit),
  85. new(RepoRedirect),
  86. new(ExternalLoginUser),
  87. new(ProtectedBranch),
  88. new(UserOpenID),
  89. new(IssueWatch),
  90. new(CommitStatus),
  91. new(Stopwatch),
  92. new(TrackedTime),
  93. new(DeletedBranch),
  94. new(RepoIndexerStatus),
  95. new(IssueDependency),
  96. new(LFSLock),
  97. new(Reaction),
  98. new(IssueAssignees),
  99. new(U2FRegistration),
  100. new(TeamUnit),
  101. new(Review),
  102. new(OAuth2Application),
  103. new(OAuth2AuthorizationCode),
  104. new(OAuth2Grant),
  105. new(Task),
  106. )
  107. gonicNames := []string{"SSL", "UID"}
  108. for _, name := range gonicNames {
  109. core.LintGonicMapper[name] = true
  110. }
  111. }
  112. func getEngine() (*xorm.Engine, error) {
  113. connStr, err := setting.DBConnStr()
  114. if err != nil {
  115. return nil, err
  116. }
  117. return xorm.NewEngine(setting.Database.Type, connStr)
  118. }
  119. // NewTestEngine sets a new test xorm.Engine
  120. func NewTestEngine(x *xorm.Engine) (err error) {
  121. x, err = getEngine()
  122. if err != nil {
  123. return fmt.Errorf("Connect to database: %v", err)
  124. }
  125. x.ShowExecTime(true)
  126. x.SetMapper(core.GonicMapper{})
  127. x.SetLogger(NewXORMLogger(!setting.ProdMode))
  128. x.ShowSQL(!setting.ProdMode)
  129. return x.StoreEngine("InnoDB").Sync2(tables...)
  130. }
  131. // SetEngine sets the xorm.Engine
  132. func SetEngine() (err error) {
  133. x, err = getEngine()
  134. if err != nil {
  135. return fmt.Errorf("Failed to connect to database: %v", err)
  136. }
  137. x.ShowExecTime(true)
  138. x.SetMapper(core.GonicMapper{})
  139. // WARNING: for serv command, MUST remove the output to os.stdout,
  140. // so use log file to instead print to stdout.
  141. x.SetLogger(NewXORMLogger(setting.Database.LogSQL))
  142. x.ShowSQL(setting.Database.LogSQL)
  143. x.SetMaxOpenConns(setting.Database.MaxOpenConns)
  144. x.SetMaxIdleConns(setting.Database.MaxIdleConns)
  145. x.SetConnMaxLifetime(setting.Database.ConnMaxLifetime)
  146. return nil
  147. }
  148. // NewEngine initializes a new xorm.Engine
  149. func NewEngine(migrateFunc func(*xorm.Engine) error) (err error) {
  150. if err = SetEngine(); err != nil {
  151. return err
  152. }
  153. if err = x.Ping(); err != nil {
  154. return err
  155. }
  156. if err = migrateFunc(x); err != nil {
  157. return fmt.Errorf("migrate: %v", err)
  158. }
  159. if err = x.StoreEngine("InnoDB").Sync2(tables...); err != nil {
  160. return fmt.Errorf("sync database struct error: %v", err)
  161. }
  162. return nil
  163. }
  164. // Statistic contains the database statistics
  165. type Statistic struct {
  166. Counter struct {
  167. User, Org, PublicKey,
  168. Repo, Watch, Star, Action, Access,
  169. Issue, Comment, Oauth, Follow,
  170. Mirror, Release, LoginSource, Webhook,
  171. Milestone, Label, HookTask,
  172. Team, UpdateTask, Attachment int64
  173. }
  174. }
  175. // GetStatistic returns the database statistics
  176. func GetStatistic() (stats Statistic) {
  177. stats.Counter.User = CountUsers()
  178. stats.Counter.Org = CountOrganizations()
  179. stats.Counter.PublicKey, _ = x.Count(new(PublicKey))
  180. stats.Counter.Repo = CountRepositories(true)
  181. stats.Counter.Watch, _ = x.Count(new(Watch))
  182. stats.Counter.Star, _ = x.Count(new(Star))
  183. stats.Counter.Action, _ = x.Count(new(Action))
  184. stats.Counter.Access, _ = x.Count(new(Access))
  185. stats.Counter.Issue, _ = x.Count(new(Issue))
  186. stats.Counter.Comment, _ = x.Count(new(Comment))
  187. stats.Counter.Oauth = 0
  188. stats.Counter.Follow, _ = x.Count(new(Follow))
  189. stats.Counter.Mirror, _ = x.Count(new(Mirror))
  190. stats.Counter.Release, _ = x.Count(new(Release))
  191. stats.Counter.LoginSource = CountLoginSources()
  192. stats.Counter.Webhook, _ = x.Count(new(Webhook))
  193. stats.Counter.Milestone, _ = x.Count(new(Milestone))
  194. stats.Counter.Label, _ = x.Count(new(Label))
  195. stats.Counter.HookTask, _ = x.Count(new(HookTask))
  196. stats.Counter.Team, _ = x.Count(new(Team))
  197. stats.Counter.Attachment, _ = x.Count(new(Attachment))
  198. return
  199. }
  200. // Ping tests if database is alive
  201. func Ping() error {
  202. if x != nil {
  203. return x.Ping()
  204. }
  205. return errors.New("database not configured")
  206. }
  207. // DumpDatabase dumps all data from database according the special database SQL syntax to file system.
  208. func DumpDatabase(filePath string, dbType string) error {
  209. var tbs []*core.Table
  210. for _, t := range tables {
  211. t := x.TableInfo(t)
  212. t.Table.Name = t.Name
  213. tbs = append(tbs, t.Table)
  214. }
  215. if len(dbType) > 0 {
  216. return x.DumpTablesToFile(tbs, filePath, core.DbType(dbType))
  217. }
  218. return x.DumpTablesToFile(tbs, filePath)
  219. }
  220. // MaxBatchInsertSize returns the table's max batch insert size
  221. func MaxBatchInsertSize(bean interface{}) int {
  222. t := x.TableInfo(bean)
  223. return 999 / len(t.ColumnsSeq())
  224. }
  225. // Count returns records number according struct's fields as database query conditions
  226. func Count(bean interface{}) (int64, error) {
  227. return x.Count(bean)
  228. }