Merge lp:~samstoll1/tiqit/rollback into lp:tiqit

[Sam Stoll]

Reverting buggy changes to allow editing different bug sections at the same time.

Unmerged revisions

11. By Sam Stoll <email address hidden> on 2016-01-19

Rolling back changes to enable editting notes and bug fields together, as it's buggy!

=== modified file 'changelog'
--- changelog	2014-11-10 14:11:37 +0000
+++ changelog	2016-01-19 12:41:51 +0000
@@ -1,3 +1,18 @@
+tiqit (1.0.2-1) trusty; urgency=low
+  * Fix for draggable tables scrolling bug
+  * Back out changes in previous release relating to submitting notes and
+    field changes together, as this is buggy.
+
+ -- Sam Stoll <[e-mail]>  Tue, 19 Jan 2016 12:36:27 +0000
+
+tiqit (1.0.1-1) trusty; urgency=low
+  * Draggable tables
+  * Submit notes and bug field changes together
+  * Enabling double click to edit preference
+  * Misc fixes
+
+ -- Sam Stoll <[e-mail]>  Mon, 18 Jan 2016 16:36:27 +0000
+
 tiqit (1.0.0-1) precise; urgency=low
   * Initial release of tiqit.
 

=== modified file 'scripts/actions/edit.py'
--- scripts/actions/edit.py	2015-12-22 15:22:57 +0000
+++ scripts/actions/edit.py	2016-01-19 12:41:51 +0000
@@ -1,7 +1,6 @@
 #! /usr/bin/python
 
 import time
-import os
 from backend import *
 from tiqit import *
 from frontend import *
@@ -22,54 +21,6 @@
 if realupdate > lastupdate:
     raise TiqitWarning("The bug has been edited since you loaded the page. Saving would have overwritten any changes made in between time. Go back to the bug and reload the page to see what fields have been modified (pressing 'Back' and then 'F5' should result in no loss of your own changes - the other modifications will simply appear in blue, alongside your own changes. You may then confirm or revert the changes, as desired).")
 
-
-#
-# Edit note
-#
-if args.has_key('tiqitAttachmentAddNote'):
-    if not args.has_key('tiqitAttachmentDeleteTitle'):
-        if len(args['tiqitAttachmentNoteContent']) > 16 * 1024 and args.has_key('tiqitAttachmentIsUpdate'):
-            raise TiqitError("Note too large. Must be less than 16kb. Use Attachements instead. Your note is %d bytes long" % len(args['tiqitAttachmentNoteContent']))
-
-    noteType = args['tiqitAttachmentNoteType']
-    noteTitle = args['tiqitAttachmentNoteTitle'].strip()
-    newTitle = args['tiqitAttachmentNewNoteTitle'].strip()
-    deleteTitle = args['tiqitAttachmentDeleteTitle'].strip()
-
-    # If this is a delete, then delete it
-    if args.has_key('tiqitAttachmentDeleteTitle'):
-        deleteNote(bugid, args['tiqitAttachmentDeleteTitle'].strip())
-    else:
-
-        # Try to rename the note if required first
-        if newTitle and newTitle != noteTitle:
-            renameNote(bugid, noteType, noteTitle, newTitle)
-
-            # Save the new name for the next step
-            noteTitle = newTitle
-
-        # Now update/create the note
-        if len(args['tiqitAttachmentNoteContent']) > 0:
-            addNote(bugid, noteType, noteTitle, args['tiqitAttachmentNoteContent'], args.has_key('tiqitAttachmentIsUpdate'))
-
-#
-# Addfile
-#
-if args.has_key('tiqitAttachmentAddFile'):
-    if args.has_key('tiqitAttachmentDeleteTitle'):
-        deleteAttachment(bugid, args['tiqitAttachmentDeleteTitle'])
-    elif args.has_key('tiqitAttachmentRenameTitle'):
-        renameAttachment(bugid, args['tiqitAttachmentRenameTitle'], args['tiqitAttachmentNewTitle'])
-    else:
-        filename = args.writeToTempFile('theFile')
-        try:
-            addAttachment(bugid, args['tiqitAttachmentFileTitle'], filename)
-        finally:
-            #
-            # In any case, delete the file!
-            #
-            os.unlink(filename)
-
 #
 # What type of bug is this
 #

=== modified file 'scripts/pages/view.py'
--- scripts/pages/view.py	2016-01-18 16:12:33 +0000
+++ scripts/pages/view.py	2016-01-19 12:41:51 +0000
@@ -110,7 +110,7 @@
          <td><a onclick='showUserDropDown(event);'>%(Updater)s</a></td>
          <td>%(Date)s</td><td>%(Size)s</td>
          <td>
-          <input type='button' onclick='renameAttachment(this);' value='Rename'><input style='display: none;' type='button' onclick='if (prepareForm()) document.getElementById("tiqitBugEdit").submit();' value='Save'><input style='display: none;' type='button' onclick='cancelAttachmentRename(this);' value='Cancel'><input type='button' onclick='deleteAttachment(this);' value='Delete'><a href='%(Url)s'>Link</a>
+          <input type='button' onclick='renameAttachment(this);' value='Rename'><input style='display: none;' type='button' onclick='saveAttachmentRename(this);' value='Save'><input style='display: none;' type='button' onclick='cancelAttachmentRename(this);' value='Cancel'><input type='button' onclick='deleteAttachment(this);' value='Delete'><a href='%(Url)s'>Link</a>
          </td>
         </tr>
         <tr class='file' style='display: none;'>
@@ -189,8 +189,6 @@
 
     printMessages()
 
-    # Make the whole page a single form
-    print "<form id='tiqitBugEdit' action='edit.py' method='post' onSubmit='return prepareForm();' enctype='multipart/form-data'>"
     # Other links section
     print """ <div id='tiqitOtherLinks'>"""
 
@@ -217,8 +215,6 @@
     for pos, (name, func) in sections:
         func(getattr(prefs, 'display%s' % name) == 'remove')
 
-    print "</form>"
-    print "<div id='extraCopies'></div>"
     printPageFooter()
 
 view_sections = bugView.getViewBugSections(theDom)
@@ -227,33 +223,32 @@
     primarytitle, primarytitleDetail, primaryformat = view_sections[0]
     printSectionHeader(primarytitle, primarytitleDetail, hide);
 
+    print "<form id='tiqitBugEdit' action='edit.py' method='post' onSubmit='return prepareForm();'>"
     print cls.getFormat(primaryformat) % args
 
     print """
+<div id='extraCopies'></div>
 <p>
  <input type='submit' value='Save Changes'>
  <input type='button' value='Reset Form' onclick='this.form.reset(); checkChildren(); checkFormValidity();'>
- <input type='button' onclick='if ((!amEditing && !amEditingNote && !amEditingFile) || confirm("You&apos;ve made changes to this bug. Cloning it will throw them away. Are you sure you want to continue?")) document.location = "newbug.py?bugid=%(Identifier)s";' value='Clone Bug'>
-</p>""" % args
+ <input type='button' onclick='if (!amEditing || confirm("You&apos;ve made changes to this bug. Cloning it will throw them away. Are you sure you want to continue?")) document.location = "newbug.py?bugid=%(Identifier)s";' value='Clone Bug'>
+</p>
+</form>""" % args
 
     printSectionFooter()
 
 def displayExtra(hide=False):
-    print "<div id='tiqitExtraFormData'>"
+    print "<form onsubmit='return false;' id='tiqitExtraFormData'>"
     for title, titleDetail, format in view_sections[1:]:
         printSectionHeader(title, titleDetail, hide)
         print cls.getFormat(format) % args
         print """
 
-<p>
-<input type='button' value='Save Changes' onClick='if (prepareForm()) document.getElementById("tiqitBugEdit").submit();'>
-<input type='button' value='Reset Form' onclick='this.form.reset(); checkChildren(); checkFormValidity();'>
-</p>
-
+<p><input type='button' value='Save Changes' onClick='if (prepareForm()) document.getElementById("tiqitBugEdit").submit();'></p>
 """
 
         printSectionFooter()
-    print "</div>"
+    print "</form>"
 #
 # Text Notes and File Attachments are printed in the same section.
 #
@@ -275,8 +270,9 @@
         print "<p>No Enclosures or Attachments.</p>"
     else:
         print """
+    <form action='editnote.py' method='post'>
     <input type='hidden' name='bugid' value='%s'>
-    <input type='hidden' name='tiqitAttachmentIsUpdate' value='true'>
+    <input type='hidden' name='isUpdate' value='true'>
     <div id='encTableContainer'>
     <table id='encTable' class='tiqitTable' style='width: 90%%'>
      <tr>
@@ -302,30 +298,33 @@
 </p>
 <div id='newnote' class='note' style='display: none;'>
  <p>Add new Enclosure:</p>
+ <form action='editnote.py' method='post'>
   <input type='hidden' name='bugid' value='%s'>
   <table>
    <tr>
     <td>Type: </td>
-    <td><select id='newnotetype' name='tiqitAttachmentNoteType' onchange='newNoteTitle(this);'>%s</select></td>
+    <td><select id='newnotetype' name='noteType' onchange='newNoteTitle(this);'>%s</select></td>
     <td>Title: </td>
-    <td><input name='tiqitAttachmentNoteTitle' id='newnotetitle' type='text' size='50' value='%s'></td>
+    <td><input name='noteTitle' id='newnotetitle' type='text' size='50' value='%s'></td>
    </tr>
    <tr>
     <td colspan='4'>
-     <textarea id='newnotecontent' name='tiqitAttachmentNoteContent' style='width: 100%%' rows='18'></textarea>
+     <textarea id='newnotecontent' name='noteContent' style='width: 100%%' rows='18'></textarea>
     </td>
    </tr>
   </table>
   <p>
-  <input type='button' onclick='if (prepareForm()) document.getElementById("tiqitBugEdit").submit();' value='Save'>
+  <input type='submit' value='Save'>
    <input type='button' onclick='hideNewNote();' value='Cancel'>
   </p>
+ </form>
 </div>
 <div id='newfile' class='note' style='display: none;'>
  <p>Attach new File:</p>
+ <form action='addfile.py' method='post' enctype='multipart/form-data'>
   <input type='hidden' name='bugid' value='%s'>
   <p>
-   Title: <input name='tiqitAttachmentFileTitle' type='text' size='50'>
+   Title: <input name='fileTitle' type='text' size='50'>
 <!--
    Type: <select name='fileType'>
     <option value='Auto'>Auto</option>
@@ -335,9 +334,10 @@
    <input type='file' name='theFile' size='30'>
   </p>
   <p>
-   <input type='button' onclick='if (prepareForm()) document.getElementById("tiqitBugEdit").submit();' value='Save'>
+   <input type='submit' value='Save'>
    <input type='button' onclick='hideNewFile();' value='Cancel'>
   </p>
+ </form>
 </div>
 """ % (bugid, "".join(["<option value='%s'>%s</option>" % (x, x) for x in noteTypes]), noteTypes[0], bugid)
 

=== modified file 'static/scripts/view.js'
--- static/scripts/view.js	2015-12-22 15:22:57 +0000
+++ static/scripts/view.js	2016-01-19 12:41:51 +0000
@@ -79,8 +79,6 @@
 
 // The object currently being edited.
 var amEditing = null;
-var amEditingNote = null;
-var amEditingFile = null;
 
 var editMsg = "You have already changed another section of this bug.\nYou may only edit one section at a time.\n\nPlease save those changes, or undo them, then try again."
 
@@ -88,7 +86,7 @@
 function makeNoteTypeSelect() {
   var opt;
   var newS = document.createElement('select');
-  newS.setAttribute('name', 'tiqitAttachmentNoteType')
+  newS.setAttribute('name', 'noteType')
 
   for (i in noteTypes) {
     opt = document.createElement('option');
@@ -122,13 +120,13 @@
   img.alt = '[+]';
   img.title = 'Show Enclosure';
 
-  if (amEditingNote == row) {
+  if (amEditing == row) {
     cancelEnclosureEdit(row.cells[6].getElementsByTagName('input')[0]);
   }
 }
 
 function editEnclosure(button) {
-  if (amEditingNote) {
+  if (amEditing) {
     alert(editMsg);
     return;
   }
@@ -140,7 +138,7 @@
 
   // Text box
   var textBox = document.createElement('textarea');
-  textBox.setAttribute('name', 'tiqitAttachmentNoteContent');
+  textBox.setAttribute('name', 'noteContent');
   textBox.setAttribute('rows', 20);
 
   var pre = table.rows[row.rowIndex + 1].cells[0].firstChild;
@@ -152,7 +150,7 @@
 
   // Type select
   var types = makeNoteTypeSelect();
-  types.setAttribute('name', 'tiqitAttachmentNoteType');
+  types.setAttribute('name', 'noteType');
   types.value = row.cells[1].textContent.substring(1, row.cells[1].textContent.lastIndexOf("'"));
   types.defaultValue = types.value;
 
@@ -161,13 +159,13 @@
   // Note title
   // First save old one
   var oldTitle = document.createElement('input');
-  oldTitle.setAttribute('name', 'tiqitAttachmentNoteTitle');
+  oldTitle.setAttribute('name', 'noteTitle');
   oldTitle.setAttribute('type', 'hidden');
   oldTitle.setAttribute('value', row.cells[0].lastChild.textContent);
   row.cells[2].appendChild(oldTitle);
 
   var title = document.createElement('input');
-  title.setAttribute('name', 'tiqitAttachmentNewNoteTitle');
+  title.setAttribute('name', 'newNoteTitle');
   title.setAttribute('type', 'text');
   title.setAttribute('value', row.cells[0].lastChild.textContent.trim());
   title.setAttribute('size', 40);
@@ -179,7 +177,7 @@
   button.nextSibling.nextSibling.nextSibling.style.display = 'none';
   button.style.display = 'none';
 
-  amEditingNote = row;
+  amEditing = row;
 }
 
 function cancelEnclosureEdit(button) {
@@ -187,7 +185,7 @@
   var row = button.parentNode.parentNode;
   var table = row.parentNode.parentNode;
 
-  if (amEditingNote != row) {
+  if (amEditing != row) {
     alert("How did you manage to cancel an edit you weren't performing?");
     return;
   }
@@ -214,11 +212,11 @@
   button.nextSibling.nextSibling.nextSibling.style.display = 'inline';
   button.style.display = 'inline';
 
-  amEditingNote = null;
+  amEditing = null;
 }
 
 function deleteEnclosure(button) {
-  if (amEditingNote) {
+  if (amEditing) {
     alert(editMsg);
     return;
   }
@@ -228,18 +226,18 @@
 
   // Note title
   var oldTitle = document.createElement('input');
-  oldTitle.setAttribute('name', 'tiqitAttachmentDeleteTitle');
+  oldTitle.setAttribute('name', 'deleteTitle');
   oldTitle.setAttribute('type', 'hidden');
   oldTitle.setAttribute('value', row.cells[0].lastChild.textContent);
   row.cells[2].appendChild(oldTitle);
 
-  amEditingNote = row;
+  amEditing = row;
 
   button.form.submit();
 }
 
 function renameAttachment(button) {
-  if (amEditingFile) {
+  if (amEditing) {
     alert(editMsg);
     return;
   }
@@ -250,20 +248,20 @@
   // Title
   // First save old one
   var oldTitle = document.createElement('input');
-  oldTitle.setAttribute('name', 'tiqitAttachmentFileTitle');
+  oldTitle.setAttribute('name', 'fileTitle');
   oldTitle.setAttribute('type', 'hidden');
   oldTitle.setAttribute('value', row.cells[0].lastChild.textContent.trim());
   row.cells[2].appendChild(oldTitle);
 
   var title = document.createElement('input');
-  title.setAttribute('name', 'tiqitAttachmentNewTitle');
+  title.setAttribute('name', 'newTitle');
   title.setAttribute('type', 'text');
   title.setAttribute('value', row.cells[0].lastChild.textContent.trim());
   title.setAttribute('size', 40);
   title.addEventListener('click', function(event) { event.stopPropagation(); }, true);
   row.cells[0].replaceChild(title, row.cells[0].lastChild);
 
-  amEditingFile = row;
+  amEditing = row;
 
   button.style.display = 'none';
   button.nextSibling.style.display = 'inline';
@@ -272,14 +270,13 @@
 }
 
 function saveAttachmentRename(button) {
-  var row = amEditingFile;
-
-  // Note title
-  var oldTitle = document.createElement('input');
-  oldTitle.setAttribute('name', 'tiqitAttachmentRenameTitle');
-  oldTitle.setAttribute('type', 'hidden');
-  oldTitle.setAttribute('value', row.cells[2].lastChild.value);
-  row.cells[2].appendChild(oldTitle);
+  var row = button.parentNode.parentNode;
+
+  var fileTitle = row.cells[2].lastChild.value;
+  var newTitle = row.cells[0].lastChild.value;
+  var bugid = document.getElementById('Identifier').value;
+
+  document.location.assign('editfile.py?bugid=' + bugid + '&renameTitle=' + fileTitle + '&newTitle=' + newTitle);
 }
 
 function cancelAttachmentRename(button) {
@@ -296,11 +293,11 @@
   button.style.display = 'none';
   button.nextSibling.style.display = 'inline';
 
-  amEditingFile = null;
+  amEditing = null;
 }
 
 function deleteAttachment(button) {
-  if (amEditingFile) {
+  if (amEditing) {
     alert(editMsg);
     return;
   }
@@ -309,7 +306,7 @@
   var bugid = document.getElementById('Identifier').value;
   var fileTitle = row.cells[0].textContent.trim();
 
-  document.location.assign('editfile.py?bugid=' + bugid + '&tiqitAttachmentDeleteTitle=' + escape(fileTitle));
+  document.location.assign('editfile.py?bugid=' + bugid + '&deleteTitle=' + escape(fileTitle));
 }
 
 function showAllEnclosures() {
@@ -395,28 +392,8 @@
 
 // New Note/File functions
 
-function addFile() {
-  var newFile = document.getElementById('newfile');
-
-  var addAttachment = document.createElement('input');
-  addAttachment.setAttribute('name', 'tiqitAttachmentAddFile');
-  addAttachment.setAttribute('type', 'hidden');
-  addAttachment.setAttribute('value', true);
-  newFile.appendChild(addAttachment);
-}
-
-function addNote() {
-  var newNote = document.getElementById('newnote');
-
-  var addAttachment = document.createElement('input');
-  addAttachment.setAttribute('name', 'tiqitAttachmentAddNote');
-  addAttachment.setAttribute('type', 'hidden');
-  addAttachment.setAttribute('value', true);
-  newNote.appendChild(addAttachment);
-}
-
 function showNewNote() {
-  if (amEditingNote) {
+  if (amEditing) {
     alert(editMsg);
     return false;
   }
@@ -427,14 +404,14 @@
   newNote.style.display = "block";
   theButton.style.display = "none";
 
-  amEditingNote = theButton;
+  amEditing = theButton;
 }
 
 function hideNewNote() {
   var newNote = document.getElementById("newnote");
   var theButton = document.getElementById("newencbuttons");
 
-  if (theButton != amEditingNote) {
+  if (theButton != amEditing) {
     alert("You're not editing a new Note!");
     return false;
   }
@@ -442,11 +419,11 @@
   newNote.style.display = "none";
   theButton.style.display = "inline";
 
-  amEditingNote = null;
+  amEditing = null;
 }
 
 function showNewFile() {
-  if (amEditingFile) {
+  if (amEditing) {
     alert(editMsg);
     return false;
   }
@@ -457,14 +434,14 @@
   newNote.style.display = "block";
   theButton.style.display = "none";
 
-  amEditingFile = theButton;
+  amEditing = theButton;
 }
 
 function hideNewFile() {
   var newNote = document.getElementById("newfile");
   var theButton = document.getElementById("newencbuttons");
 
-  if (theButton != amEditingFile) {
+  if (theButton != amEditing) {
     alert("You're not editing a new File!");
     return false;
   }
@@ -472,7 +449,7 @@
   newNote.style.display = "none";
   theButton.style.display = "inline";
 
-  amEditingFile = null;
+  amEditing = null;
 }
 
 function initNoteTitleChange() {
@@ -804,35 +781,18 @@
 //
 
 function prepareForm() {
-  if (amEditing && (amEditingFile || amEditingNote)) {
-    if (!confirm("You've made changes to another section of this bug. Do you wish to continue and also save these changes?")) {
-        return false;
-    }
-  }
-  if (amEditingFile) {
-    if (amEditingFile.tagName == 'P') {
-      addFile();
-    } else if (amEditingFile.tagName == 'TR') {
-      saveAttachmentRename();
-    }
-  }
-  if (amEditingNote) {
-    addNote();
-  }
-
-
   var form = document.getElementById('tiqitBugEdit');
   var extra = document.getElementById('tiqitExtraFormData');
-  
+
   var inputs = extra.getElementsByTagName('input');
   var selects = extra.getElementsByTagName('select');
-  
+
   var extraDiv = document.getElementById('extraCopies');
-  
+
   while (extraDiv.childNodes.length) {
     extraDiv.removeChild(extraDiv.childNodes[0]);
   }
-  
+
   for (var i = 0; i < inputs.length; i++) {
     if (inputs[i].name && ((inputs[i].type != 'checkbox' && inputs[i].value) || inputs[i].checked) && !inputs[i].disabled) {
       var hidden = document.createElement('input');
@@ -842,7 +802,7 @@
       extraDiv.appendChild(hidden);
     }
   }
-  
+
   for (var i = 0; i < selects.length; i++) {
     if (selects[i].name && selects[i].value && !selects[i].disabled) {
       var hidden = document.createElement('input');
@@ -852,12 +812,12 @@
       extraDiv.appendChild(hidden);
     }
   }
-  
+
   var oldRelates = new Array();
   var newRelates = document.getElementById('tiqitNewRelates');
-  
+
   var relatesTable = document.getElementById('tiqitRelatesTable');
-  
+
   if (relatesTable) {
     for (row = 0; row < relatesTable.rows.length; row++) {
       // Related bugs with disabled check boxes are those that aren't tracked
@@ -868,7 +828,7 @@
       }
     }
   }
-  
+
   if (newRelates) {
     var hidden = document.createElement('input');
     hidden.type = 'hidden';
@@ -876,7 +836,7 @@
     hidden.value = oldRelates.join(',') + ',' + newRelates.value;
     extraDiv.appendChild(hidden);
   }
-  
+
   if (!checkFormValidity())
     return confirm("Missing info in form. Submit anyway?");
   else