Changeset 4307

Timestamp:

09/20/08 15:45:02 (2 months ago)

Author:

Blackhex

Message:

ScreenshotsPlugin:

• Bug #3697 fix.
  

Files:

• screenshotsplugin/0.10/tracscreenshots/core.py (modified) (3 diffs)
• screenshotsplugin/0.11/tracscreenshots/core.py (modified) (2 diffs)

screenshotsplugin/0.10/tracscreenshots/core.py

@@ -10 +10 @@
-from trac.util import format_datetime, pretty_timedelta, TracError
-from trac.util.html import html
+from trac.util.text import to_unicode
-
-from trac.web.main import IRequestHandler
@@ -341 +342 @@
-                old_screenshot = api.get_screenshot(cursor, screenshot_id)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                    raise TracError('Edited screenshot not found.',
-                      'Screenshot not found.')
-
+                # Construct screenshot dictionary from form values.
+                screenshot = {'name' :  req.args.get('name'),
+                              'description' : req.args.get('description'),
+                              'author' : req.authname,
+                              'tags' : req.args.get('tags'),
+                              'components' : req.args.get('components') or [],
+                              'versions' : req.args.get('versions') or []}
+
+                # Converst components and versions to list if only one item is
+                # selected.
+                if not isinstance(screenshot['components'], list):
+                     screenshot['components'] = [screenshot['components']]
+                if not isinstance(screenshot['versions'], list):
+                     screenshot['versions'] = [screenshot['versions']]
+
+                # Edit screenshot.
+                api.edit_screenshot(cursor, screenshot_id, screenshot)
+
+                # Notify change listeners.
+                for listener in self.change_listeners:
+                    listener.screenshot_changed(screenshot, old_screenshot)
+
+                # Clear id to prevent display of edit and delete button.
+                req.args['id'] = None
+
-            elif action == 'delete':
-                req.perm.assert_permission('SCREENSHOTS_ADMIN')
@@ -377 +378 @@
-                screenshot = api.get_screenshot(cursor, req.args.get('id'))
-
+                # Check if requested screenshot exits.
+                if not screenshot:
+                    raise TracError('Deleted screenshot not found.',
+                      'Screenshot not found.')
+
+                # Delete screenshot.
+                api.delete_screenshot(cursor, screenshot['id'])
+
+                #Â Delete screenshot files. Don't append any other files there :-).
-                try:
-                    # Delete screenshot.
-                    api.delete_screenshot(cursor, screenshot['id'])
-
-                    #Â Delete screenshot files. Don't append any other files there :-).
-                    path = os.path.join(self.path, to_unicode(screenshot['id']))
-                    path = os.path.normpath(path)

screenshotsplugin/0.11/tracscreenshots/core.py

@@ -361 +361 @@
-                old_screenshot = api.get_screenshot(context, screenshot_id)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                    raise TracError('Edited screenshot not found.',
-                      'Screenshot not found.')
-
+                # Construct screenshot dictionary from form values.
+                screenshot = {'name' :  context.req.args.get('name'),
+                              'description' : context.req.args.get(
+                                'description'),
+                              'author' : context.req.authname,
+                              'tags' : context.req.args.get('tags'),
+                              'components' : context.req.args.get(
+                                'components') or [],
+                              'versions' : context.req.args.get('versions') or []}
+
+                # Convert components and versions to list if only one item is
+                # selected.
+                if not isinstance(screenshot['components'], list):
+                     screenshot['components'] = [screenshot['components']]
+                if not isinstance(screenshot['versions'], list):
+                     screenshot['versions'] = [screenshot['versions']]
+
+                # Edit screenshot.
+                api.edit_screenshot(context, screenshot_id, screenshot)
+
+
+                # Notify change listeners.
+                for listener in self.change_listeners:
+                    listener.screenshot_changed(context.req, screenshot,
+                      old_screenshot)
+
+                # Clear id to prevent display of edit and delete button.
+                context.req.args['id'] = None
+
-            elif action == 'delete':
-                context.req.perm.assert_permission('SCREENSHOTS_ADMIN')
@@ -406 +404 @@
-                screenshot = api.get_screenshot(context, screenshot_id)
-
+                # Check if requested screenshot exits.
+                if not screenshot:
+                    raise TracError('Deleted screenshot not found.',
+                      'Screenshot not found.')
-                try:
-                    # Delete screenshot.