Changeset 3461

Timestamp:

Jun 24, 2006, 12:36:42 AM (18 years ago)

Author:

Christian Boos

Message:

Don't display the Your email or username: field for authenticated users.

Applied 1890-firststeps.patch from maxb, with a minor modification in get_reporter_id.

Related to ticket #1890.

Location:

trunk

Files:

• templates/attachment.cs (modified) (1 diff)
• templates/newticket.cs (modified) (1 diff)
• templates/ticket.cs (modified) (1 diff)
• templates/wiki.cs (modified) (1 diff)
• trac/attachment.py (modified) (1 diff)
• trac/ticket/web_ui.py (modified) (6 diffs)
• trac/util/__init__.py (modified) (1 diff)
• trac/wiki/web_ui.py (modified) (2 diffs)

trunk/templates/attachment.cs

@@ -15 +15 @@
   <fieldset>
    <legend>Attachment Info</legend>
-   <div class="field">
-    <label>Your email or username:<br />
-    <input type="text" name="author" size="30" value="<?cs
-      var:attachment.author?>" /></label>
-   </div>
+   <?cs if:trac.authname == "anonymous" ?>
+    <div class="field">
+     <label>Your email or username:<br />
+     <input type="text" name="author" size="30" value="<?cs
+       var:attachment.author?>" /></label>
+    </div>
+   <?cs /if ?>
    <div class="field">
     <label>Description of the file (optional):<br />

trunk/templates/newticket.cs

@@ -12 +12 @@
 <form id="newticket" method="post" action="<?cs
   var:trac.href.newticket ?>#preview">
- <div class="field">
-  <label for="reporter">Your email or username:</label><br />
-  <input type="text" id="reporter" name="reporter" size="40" value="<?cs
-    var:newticket.reporter ?>" /><br />
- </div>
+ <?cs if:trac.authname == "anonymous" ?>
+  <div class="field">
+   <label for="reporter">Your email or username:</label><br />
+   <input type="text" id="reporter" name="reporter" size="40" value="<?cs
+     var:newticket.reporter ?>" /><br />
+  </div>
+ <?cs /if ?>
  <div class="field">
   <label for="summary">Short summary:</label><br />

trunk/templates/ticket.cs

@@ -145 +145 @@
  <h3><a name="edit" onfocus="document.getElementById('comment').focus()">Add/Change #<?cs
    var:ticket.id ?> (<?cs var:ticket.summary ?>)</a></h3>
- <div class="field">
-  <label for="author">Your email or username:</label><br />
-  <input type="text" id="author" name="author" size="40"
-    value="<?cs var:ticket.reporter_id ?>" /><br />
- </div>
+ <?cs if:trac.authname == "anonymous" ?>
+  <div class="field">
+   <label for="author">Your email or username:</label><br />
+   <input type="text" id="author" name="author" size="40"
+     value="<?cs var:ticket.reporter_id ?>" /><br />
+  </div>
+ <?cs /if ?>
  <div class="field">
   <fieldset class="iefix">

trunk/templates/wiki.cs

@@ -264 +264 @@
     <fieldset id="changeinfo">
      <legend>Change information</legend>
-     <div class="field">
-      <label>Your email or username:<br />
-      <input id="author" type="text" name="author" size="30" value="<?cs
-        var:wiki.author ?>" /></label>
-     </div>
+     <?cs if:trac.authname == "anonymous" ?>
+      <div class="field">
+       <label>Your email or username:<br />
+       <input id="author" type="text" name="author" size="30" value="<?cs
+         var:wiki.author ?>" /></label>
+      </div>
+     <?cs /if ?>
      <div class="field">
       <label>Comment about this change (optional):<br />

trunk/trac/attachment.py

@@ -447 +447 @@
 
         attachment.description = req.args.get('description', '')
-        attachment.author = req.args.get('author', '')
+        attachment.author = get_reporter_id(req, 'author')
         attachment.ipnr = req.remote_addr
 

trunk/trac/ticket/web_ui.py

@@ -111 +111 @@
         ticket = Ticket(self.env, db=db)
         ticket.populate(req.args)
-        ticket.values.setdefault('reporter', get_reporter_id(req))
+        ticket.values['reporter'] = get_reporter_id(req, 'reporter')
 
         if ticket.values.has_key('description'):
@@ -164 +164 @@
 
         ticket = Ticket(self.env, db=db)
-        ticket.values.setdefault('reporter', get_reporter_id(req))
         ticket.populate(req.args)
+        ticket.values['reporter'] = get_reporter_id(req, 'reporter')
         self._validate_ticket(req, ticket)
 
@@ -254 +254 @@
 
         ticket = Ticket(self.env, id, db=db)
-        reporter_id = get_reporter_id(req)
 
         if req.method == 'POST':
@@ -269 +268 @@
                                                    or req.authname
                 req.hdf['ticket.resolve_resolution'] = req.args.get('resolve_resolution')
-                reporter_id = req.args.get('author')
                 comment = req.args.get('comment')
                 if comment:
@@ -281 +279 @@
             req.hdf['ticket.ts'] = ticket.time_changed
 
-        self._insert_ticket_data(req, db, ticket, reporter_id)
+        self._insert_ticket_data(req, db, ticket,
+                                 get_reporter_id(req, 'author'))
 
         mime = Mimeview(self.env)
@@ -523 +522 @@
         if cnum and replyto: # record parent.child relationship
             internal_cnum = '%s.%s' % (replyto, cnum)
-        ticket.save_changes(req.args.get('author', req.authname),
+        ticket.save_changes(get_reporter_id(req, 'author'),
                             req.args.get('comment'), when=now, db=db,
                             cnum=internal_cnum)

trunk/trac/util/__init__.py

@@ -40 +40 @@
 # -- req/session utils
 
-def get_reporter_id(req):
+def get_reporter_id(req, arg_name=None):
+    if req.authname != 'anonymous':
+        return req.authname
+    if arg_name:
+        r = req.args.get(arg_name)
+        if r:
+            return r
     name = req.session.get('name', None)
     email = req.session.get('email', None)
-    
-    if req.authname != 'anonymous':
-        return req.authname
-    elif name and email:
+    if name and email:
         return '%s <%s>' % (name, email)
-    elif not name and email:
-        return email
-    else:
-        return req.authname
+    return name or email or req.authname # == 'anonymous'
 
 

trunk/trac/wiki/web_ui.py

@@ -227 +227 @@
                     raise InvalidWikiPage("Invalid Wiki page: %s" % message)
 
-        page.save(req.args.get('author'), req.args.get('comment'),
+        page.save(get_reporter_id(req, 'author'), req.args.get('comment'),
                   req.remote_addr)
         req.redirect(req.href.wiki(page.name))
@@ -337 +337 @@
             page.readonly = req.args.has_key('readonly')
 
-        author = req.args.get('author', get_reporter_id(req))
+        author = get_reporter_id(req, 'author')
         comment = req.args.get('comment', '')
         editrows = req.args.get('editrows')