summaryrefslogtreecommitdiffstats
path: root/models/fixtures
diff options
context:
space:
mode:
authorJonas Franz <info@jonasfranz.software>2017-09-12 08:48:13 +0200
committerLauris BH <lauris@nix.lv>2017-09-12 09:48:13 +0300
commit5ccecb44adddf17e1a3ec8ae6e1ad75cb0ff94e6 (patch)
treee7ab5e7965be4d1ad92655c74d0ce8fbc0954df2 /models/fixtures
parent69dfe43ffc865bfa9c7a81375752d064a0013df3 (diff)
downloadgitea-5ccecb44adddf17e1a3ec8ae6e1ad75cb0ff94e6.tar.gz
gitea-5ccecb44adddf17e1a3ec8ae6e1ad75cb0ff94e6.zip
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>
Diffstat (limited to 'models/fixtures')
-rw-r--r--models/fixtures/comment.yml3
-rw-r--r--models/fixtures/issue.yml13
-rw-r--r--models/fixtures/repo_unit.yml4
-rw-r--r--models/fixtures/repository.yml2
-rw-r--r--models/fixtures/stopwatch.yml11
-rw-r--r--models/fixtures/tracked_time.yml34
6 files changed, 64 insertions, 3 deletions
diff --git a/models/fixtures/comment.yml b/models/fixtures/comment.yml
index 3292bb4848..34df02d28c 100644
--- a/models/fixtures/comment.yml
+++ b/models/fixtures/comment.yml
@@ -5,15 +5,18 @@
issue_id: 1 # in repo_id 1
label_id: 1
content: "1"
+ created_unix: 946684810
-
id: 2
type: 0 # comment
poster_id: 3 # user not watching (see watch.yml)
issue_id: 1 # in repo_id 1
content: "good work!"
+ created_unix: 946684811
-
id: 3
type: 0 # comment
poster_id: 5 # user not watching (see watch.yml)
issue_id: 1 # in repo_id 1
content: "meh..."
+ created_unix: 946684812
diff --git a/models/fixtures/issue.yml b/models/fixtures/issue.yml
index 7bbbab26fe..b80ada1ba4 100644
--- a/models/fixtures/issue.yml
+++ b/models/fixtures/issue.yml
@@ -57,3 +57,16 @@
content: content5
is_closed: true
is_pull: false
+-
+ id: 6
+ repo_id: 3
+ index: 1
+ poster_id: 1
+ assignee_id: 1
+ name: issue6
+ content: content6
+ is_closed: false
+ is_pull: false
+ num_comments: 0
+ created_unix: 946684800
+ updated_unix: 978307200
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml
index 02daa48277..57cf35e198 100644
--- a/models/fixtures/repo_unit.yml
+++ b/models/fixtures/repo_unit.yml
@@ -11,7 +11,7 @@
repo_id: 1
type: 2
index: 1
- config: "{}"
+ config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
created_unix: 946684810
-
@@ -51,7 +51,7 @@
repo_id: 3
type: 2
index: 1
- config: "{}"
+ config: "{\"EnableTimetracker\":false,\"AllowOnlyContributorsToTrackTime\":false}"
created_unix: 946684810
-
diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml
index b8f607b2a8..3409ba8113 100644
--- a/models/fixtures/repository.yml
+++ b/models/fixtures/repository.yml
@@ -29,7 +29,7 @@
lower_name: repo3
name: repo3
is_private: true
- num_issues: 0
+ num_issues: 1
num_closed_issues: 0
num_pulls: 0
num_closed_pulls: 0
diff --git a/models/fixtures/stopwatch.yml b/models/fixtures/stopwatch.yml
new file mode 100644
index 0000000000..397a8214d4
--- /dev/null
+++ b/models/fixtures/stopwatch.yml
@@ -0,0 +1,11 @@
+-
+ id: 1
+ user_id: 1
+ issue_id: 1
+ created_unix: 1500988502
+
+-
+ id: 2
+ user_id: 2
+ issue_id: 2
+ created_unix: 1500988502
diff --git a/models/fixtures/tracked_time.yml b/models/fixtures/tracked_time.yml
new file mode 100644
index 0000000000..06a71c5ad9
--- /dev/null
+++ b/models/fixtures/tracked_time.yml
@@ -0,0 +1,34 @@
+-
+ id: 1
+ user_id: 1
+ issue_id: 1
+ time: 400
+ created_unix: 946684800
+
+-
+ id: 2
+ user_id: 2
+ issue_id: 2
+ time: 3661
+ created_unix: 946684801
+
+-
+ id: 3
+ user_id: 2
+ issue_id: 2
+ time: 1
+ created_unix: 946684802
+
+-
+ id: 4
+ user_id: -1
+ issue_id: 4
+ time: 1
+ created_unix: 946684802
+
+-
+ id: 5
+ user_id: 2
+ issue_id: 5
+ time: 1
+ created_unix: 946684802