summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rt-liberation-org.el36
1 files changed, 25 insertions, 11 deletions
diff --git a/rt-liberation-org.el b/rt-liberation-org.el
index 70dd536..15a0451 100644
--- a/rt-liberation-org.el
+++ b/rt-liberation-org.el
@@ -38,18 +38,30 @@
the query (for links starting with 'query:')."
(require 'rt-liberation)
(cond
- ((string-match "^id:\\([^#]+\\)\\(#\\(.+\\)\\)?" link)
- (let ((id (match-string 1 link))
- (section (string-to-number (or (match-string 3 link) "0"))))
+ ((string-match "^id:\\([^/]+\\)\\(/\\(.+\\)\\)?" link)
+ (let (
+ (id (match-string 1 link))
+ (history-id (match-string 3 link))
+ )
(rt-liber-browse-query (format "id = \"%s\"" id))
(rt-liber-next-ticket-in-browser)
(rt-liber-ticket-at-point)
- (dotimes (unused section)
- (rt-liber-viewer2-next-section-in))
- ))
+ (if history-id
+ (let (
+ (current-history-id (alist-get 'id (rt-liber-viewer2-get-section-data)))
+ (previous-history-id nil)
+ )
+ (while (not (or (string-equal history-id current-history-id)
+ (eq current-history-id previous-history-id)))
+ (setq previous-history-id current-history-id)
+ (rt-liber-viewer2-next-section-in)
+ (setq current-history-id (alist-get 'id (rt-liber-viewer2-get-section-data)))
+ )
+ ))))
((string-match "^query:\\(.+\\)" link)
(rt-liber-browse-query (match-string 1 link)))
- (t (error "Unrecognized link type '%s'" link))))
+ (t (error "Unrecognized link type '%s'" link))
+ ))
(defun rt-org-store-link ()
"Stores an rt link in ticket-browser mode."
@@ -57,10 +69,12 @@
(let ((ticket (or (get-text-property (point) 'rt-ticket)
rt-liber-ticket-local)))
(when ticket
- (let (
- (link (concat "rt:id:" (rt-liber-ticket-id-only ticket)))
- (subject (cdr (assoc "Subject" ticket)))
- )
+ (let* (
+ (ticket-id-link (concat "rt:id:" (rt-liber-ticket-id-only ticket)))
+ (subject (cdr (assoc "Subject" ticket)))
+ (history-id (alist-get 'id (rt-liber-viewer2-get-section-data)))
+ (link (concat ticket-id-link (if history-id (concat "/" history-id) "")))
+ )
(org-link-add-props
:link link
:description subject