doc/classes/TasksController.src/M000107.html in backlog-0.7.12 vs doc/classes/TasksController.src/M000107.html in backlog-0.8.0
- old
+ new
@@ -16,11 +16,11 @@
<span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>] <span class="ruby-operator">&&</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:description</span>] <span class="ruby-operator">==</span> <span class="ruby-value str">''</span>
<span class="ruby-identifier">destroy</span>
<span class="ruby-keyword kw">return</span>
<span class="ruby-keyword kw">end</span>
<span class="ruby-ivar">@task</span> = <span class="ruby-constant">Task</span>.<span class="ruby-identifier">find</span>(<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:id</span>])
- <span class="ruby-keyword kw">unless</span> (<span class="ruby-ivar">@task</span>.<span class="ruby-identifier">period</span> <span class="ruby-operator">&&</span> <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">period</span>.<span class="ruby-identifier">active?</span>) <span class="ruby-operator">||</span> (<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>] <span class="ruby-operator">&&</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:period_id</span>] <span class="ruby-operator">&&</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:period_id</span>].<span class="ruby-identifier">to_i</span> <span class="ruby-operator">></span> <span class="ruby-value">0</span> <span class="ruby-operator">&&</span> (<span class="ruby-identifier">period</span> = <span class="ruby-constant">Period</span>.<span class="ruby-identifier">find_by_id</span>(<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:period_id</span>])) <span class="ruby-operator">&&</span> <span class="ruby-identifier">period</span>.<span class="ruby-identifier">active?</span>)
+ <span class="ruby-keyword kw">unless</span> (<span class="ruby-ivar">@task</span>.<span class="ruby-identifier">period</span> <span class="ruby-operator">&&</span> <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">period</span>.<span class="ruby-identifier">active_or_future?</span>) <span class="ruby-operator">||</span> (<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>] <span class="ruby-operator">&&</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:period_id</span>] <span class="ruby-operator">&&</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:period_id</span>].<span class="ruby-identifier">to_i</span> <span class="ruby-operator">></span> <span class="ruby-value">0</span> <span class="ruby-operator">&&</span> (<span class="ruby-identifier">period</span> = <span class="ruby-constant">Period</span>.<span class="ruby-identifier">find_by_id</span>(<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:period_id</span>])) <span class="ruby-operator">&&</span> <span class="ruby-identifier">period</span>.<span class="ruby-identifier">active?</span>)
<span class="ruby-ivar">@task</span>.<span class="ruby-identifier">errors</span>.<span class="ruby-identifier">add</span>(<span class="ruby-identifier">:period_id</span>, <span class="ruby-value str">"You may not update a task in an inactive period. Move the task to an active period first."</span>)
<span class="ruby-identifier">back_or_redirect_to</span> <span class="ruby-identifier">:controller</span> =<span class="ruby-operator">></span> <span class="ruby-value str">'periods'</span>, <span class="ruby-identifier">:action</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">:show</span>, <span class="ruby-identifier">:id</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">period</span>, <span class="ruby-identifier">:task</span> =<span class="ruby-operator">></span> <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">id</span>
<span class="ruby-keyword kw">return</span>
<span class="ruby-keyword kw">end</span>
@@ -38,12 +38,17 @@
<span class="ruby-identifier">new_pos</span> = <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">backlog</span>.<span class="ruby-identifier">tasks</span>.<span class="ruby-identifier">count</span>(<span class="ruby-identifier">:conditions</span> =<span class="ruby-operator">></span> <span class="ruby-value str">'period_id IS NULL'</span>) <span class="ruby-operator">+</span> <span class="ruby-value">1</span>
<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:position</span>] = <span class="ruby-identifier">new_pos</span>
<span class="ruby-keyword kw">end</span>
<span class="ruby-keyword kw">end</span>
<span class="ruby-keyword kw">end</span>
+
+ <span class="ruby-identifier">file_name</span> = <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>].<span class="ruby-identifier">delete</span>(<span class="ruby-identifier">:file</span>)
<span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>] <span class="ruby-operator">&&</span> <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">update_attributes</span>(<span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>])
<span class="ruby-identifier">flash</span>[<span class="ruby-identifier">:notice</span>] = <span class="ruby-value str">'Task was successfully updated.'</span>
+ <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">file_name</span>
+ <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">task_files</span>.<span class="ruby-identifier">create!</span> <span class="ruby-identifier">:name</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">file_name</span>.<span class="ruby-identifier">original_filename</span>, <span class="ruby-identifier">:content_data</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">file_name</span>.<span class="ruby-identifier">read</span>, <span class="ruby-identifier">:content_type</span> =<span class="ruby-operator">></span> <span class="ruby-identifier">file_name</span>.<span class="ruby-identifier">content_type</span>
+ <span class="ruby-keyword kw">end</span>
<span class="ruby-keyword kw">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:todo</span>] <span class="ruby-operator">&&</span> <span class="ruby-identifier">params</span>[<span class="ruby-identifier">:task</span>][<span class="ruby-identifier">:todo</span>].<span class="ruby-identifier">to_i</span> <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
<span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">finished_at</span>
<span class="ruby-identifier">next_task</span> = <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">lower_item</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@task</span>.<span class="ruby-identifier">higher_item</span>
<span class="ruby-ivar">@task</span>.<span class="ruby-identifier">finish</span> <span class="ruby-constant">Task</span><span class="ruby-operator">::</span><span class="ruby-constant">COMPLETED</span>, <span class="ruby-keyword kw">true</span>, <span class="ruby-identifier">user</span>
<span class="ruby-ivar">@task</span>.<span class="ruby-identifier">save!</span>
\ No newline at end of file