Merge lp:~psivaa/uci-engine/assignable-for-edit into lp:uci-engine

[Para Siva]

Adding 'Ready to assign' to the edit form, following josepht's MP, https://code.launchpad.net/~joetalbott/uci-engine/add_ready_checkbox/+merge/243878

[Francis Ginther (fginther)]

If a ticket is already marked as "ready to assign" and then edited again, the checkbox appears unset. As there is no way to go backward from "ready to assign" to not, the form should show that the option is set, but not allow it to be unset or just not display the option if it is set.

review: Needs Fixing

[lp:~psivaa/uci-engine/assignable-for-edit]

911. By Para Siva on 2014-12-18

Once a ticket is marked as ready to assign, no going back

912. By Para Siva on 2014-12-18

Adding test for not allowing to uncheck assignable

[Para Siva (psivaa)]

Thanks for the point, Francis. That has been fixed and a test to that effect is also added. Would appreciate a further look. Thanks

[lp:~psivaa/uci-engine/assignable-for-edit]

913. By Para Siva on 2015-01-12

Merging trunk

Unmerged revisions

913. By Para Siva on 2015-01-12

Merging trunk

912. By Para Siva on 2014-12-18

Adding test for not allowing to uncheck assignable

911. By Para Siva on 2014-12-18

Once a ticket is marked as ready to assign, no going back

910. By Para Siva on 2014-12-12

assignable checkbox for editing

=== modified file 'tests/test_webui.py' (properties changed: +x to -x)
--- tests/test_webui.py	2015-01-09 13:27:24 +0000
+++ tests/test_webui.py	2015-01-12 09:52:29 +0000
@@ -123,6 +123,98 @@
         for error_span in require_errors:
             assert_displayed(error_span)
 
+    def test_edit_ticket_assignable(self):
+        # Create a ticket via WebUI form.
+        go_to('/create')
+        assert_title('Ubuntu CI Engine')
+        title_text = 'Create for assignable edit {}'.format(time.asctime())
+
+        wait_for(get_element, tag='form')
+
+        # Submit the form with the required fields.
+        title = get_element_by_css('input[name="title"]')
+        write_textfield(title, title_text)
+        owner = get_element_by_css('input[name="owner"]')
+        write_textfield(owner, '[e-mail]')
+
+        submit = get_element_by_css('input[type="submit"]')
+        click_button(submit, wait=True)
+
+        ticket_title = wait_for(get_element, tag='h2')
+        self.assertEqual(title_text, ticket_title.text)
+
+        # Edit a ticket sources & MPs.
+        go_to('/')
+
+        # Edit the first available ticket.
+        wait_for(get_element_by_css, 'a.yui3-pagview-link-page-active')
+        a_ticket_link = get_elements_by_css('a.row_link')[0]
+        a_ticket_link.click()
+        edit_link = wait_for(get_element_by_css, 'a.edit-link')
+        edit_link.click()
+        wait_for(get_element, tag='form')
+
+        # Update the ticket with a unique title and distinct sources
+        # and merge proposals.
+        new_title = 'Edited assignable {}!'.format(time.asctime())
+        title = get_element_by_css('input[name="title"]')
+        write_textfield(title, new_title)
+        assignable = get_element_by_css('input[name="assignable"]')
+        set_checkbox_value(assignable, True)
+        submit = get_element_by_css('input[type="submit"]')
+        click_button(submit, wait=True)
+
+        spinners = get_elements_by_css('img[title="Silo creating"]')
+        self.assertEqual(1, len(spinners),
+                         "Silo creating spinner is not shown on the page")
+
+    def test_edit_ticket_un_un_assignable(self):
+        # Create a ticket via WebUI form.
+        go_to('/create')
+        assert_title('Ubuntu CI Engine')
+        title_text = 'Create for assignable edit {}'.format(time.asctime())
+
+        wait_for(get_element, tag='form')
+
+        # Submit the form with the required fields.
+        title = get_element_by_css('input[name="title"]')
+        write_textfield(title, title_text)
+        owner = get_element_by_css('input[name="owner"]')
+        write_textfield(owner, '[e-mail]')
+        assignable = get_element_by_css('input[name="assignable"]')
+        set_checkbox_value(assignable, True)
+
+        submit = get_element_by_css('input[type="submit"]')
+        click_button(submit, wait=True)
+
+        ticket_title = wait_for(get_element, tag='h2')
+        self.assertEqual(title_text, ticket_title.text)
+
+        # Edit a ticket sources & MPs.
+        go_to('/')
+
+        # Edit the first available ticket.
+        wait_for(get_element_by_css, 'a.yui3-pagview-link-page-active')
+        a_ticket_link = get_elements_by_css('a.row_link')[0]
+        a_ticket_link.click()
+        edit_link = wait_for(get_element_by_css, 'a.edit-link')
+        edit_link.click()
+        wait_for(get_element, tag='form')
+
+        # Update the ticket with a unique title and distinct sources
+        # and merge proposals.
+        new_title = 'Edited assignable {}!'.format(time.asctime())
+        title = get_element_by_css('input[name="title"]')
+        write_textfield(title, new_title)
+        assignable = get_element_by_css('input[name="assignable"]')
+        self.assertEqual(assignable.is_enabled(), False)
+
+        submit = get_element_by_css('input[type="submit"]')
+        click_button(submit, wait=True)
+        spinners = get_elements_by_css('img[title="Silo creating"]')
+        self.assertEqual(1, len(spinners),
+                         "Silo creating spinner is not shown on the page")
+
     def test_create_ticket(self):
         # Create a ticket via WebUI form.
         go_to('/create')

=== modified file 'webui/tickets/static/tickets/webuiforms.js'
--- webui/tickets/static/tickets/webuiforms.js	2014-12-19 21:01:56 +0000
+++ webui/tickets/static/tickets/webuiforms.js	2015-01-12 09:52:29 +0000
@@ -238,7 +238,7 @@
          *
          * Positive int32 except ZERO (1 - 2147483648)
          *
-         * @method setupEditForm
+         * @method validateBugId
          */
         validateBugId: function(val, field) {
             var filter = /^[\d]*$/;
@@ -306,6 +306,8 @@
                      type: 'TextareaField'},
                     {name: 'comments', label: 'Comments:',
                      type: 'TextareaField'},
+                    {name: 'assignable', label: 'Ready to assign?',
+                     type: 'CheckboxField'},
                     {name: 'edit-button', type: 'SubmitButton',
                      value: 'Update!'}
                 ]
@@ -345,6 +347,12 @@
                                 });
                                 field.set('value', mps.join('\n'));
                                 break;
+                            case 'assignable':
+                                if (ticket['status'] === 'In progress') {
+                                    field.set("checked", true);
+                                    field.set("disabled", true);                       
+                                }
+                                break;
                             default:
                                 field.set('value', ticket[name] || '');
                             }
@@ -386,6 +394,7 @@
                 var form_data = f.toJSON();
                 form_data = Y.webuiforms._mangleFormSources(form_data);
                 form_data = Y.webuiforms._mangleFormCitrain(form_data);
+                form_data = Y.webuiforms._mangleFormAssignable(form_data);
                 /* Tastypie integer field do not cope with empty strings,
                    if cleared, 'bug_id' has to be explicitly null. */
                 if (!form_data['bug_id'].trim()) {