cafe-grader-web

Commit r635:58b977bcebf1 public

parent | child
Description:
change lock syntax to be as of rails 4
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r635:58b977bcebf1 - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -3,63 +3,63
3 3 belongs_to :submission
4 4
5 5 STATUS_GRADING = 0
6 6 STATUS_INQUEUE = 1
7 7 STATUS_COMPLETE = 2
8 8
9 9 def status_inqueue
10 10 self.status = Task::STATUS_INQUEUE
11 11 end
12 12
13 13 def status_inqueue!
14 14 status_inqueue
15 15 self.save
16 16 end
17 17
18 18 def status_grading
19 19 self.status = Task::STATUS_GRADING
20 20 end
21 21
22 22 def status_grading!
23 23 status_grading
24 24 self.save
25 25 end
26 26
27 27 def status_complete
28 28 self.status = Task::STATUS_COMPLETE
29 29 end
30 30
31 31 def status_complete!
32 32 status_complete
33 33 self.save
34 34 end
35 35
36 36 def status_str
37 37 case self.status
38 38 when Task::STATUS_INQUEUE
39 39 "inqueue"
40 40 when Task::STATUS_GRADING
41 41 "grading"
42 42 when Task::STATUS_COMPLETE
43 43 "complete"
44 44 end
45 45 end
46 46
47 47 def self.get_inqueue_and_change_status(status)
48 48 task = nil
49 49 begin
50 50 Task.transaction do
51 - task = Task.where(status: Task::STATUS_INQUEUE).where(lock: true).first
51 + task = Task.where(status: Task::STATUS_INQUEUE).lock(true).first
52 52 if task!=nil
53 53 task.status = status
54 54 task.save!
55 55 end
56 56 end
57 57
58 58 rescue
59 59 task = nil
60 60
61 61 end
62 62 task
63 63 end
64 64
65 65 end
You need to be logged in to leave comments. Login now