kallithea Changeset - 3fdf7c3be2c9

Changeset - 3fdf7c3be2c9

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 13 years ago 2012-07-15 04:02:58
marcin@python-works.com

added mark as read for single notifications

6 files changed with 79 insertions and 11 deletions:

rhodecode/controllers/admin/notifications.py

rhodecode/model/notification.py

rhodecode/public/css/style.css

rhodecode/public/js/rhodecode.js

rhodecode/templates/admin/notifications/notifications.html

rhodecode/templates/admin/notifications/notifications_data.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/notifications.py

➞

Show inline comments

@@ @@ -61,98 +61,110 @@ class NotificationsController(BaseContro @@
         # url('notifications')
         c.user = self.rhodecode_user
         notif = NotificationModel().get_for_user(self.rhodecode_user.user_id,
                                             filter_=request.GET.getall('type'))
         p = int(request.params.get('page', 1))
         c.notifications = Page(notif, page=p, items_per_page=10)
         c.pull_request_type = Notification.TYPE_PULL_REQUEST
         c.comment_type = [Notification.TYPE_CHANGESET_COMMENT,
                           Notification.TYPE_PULL_REQUEST_COMMENT]
         _current_filter = request.GET.getall('type')
         c.current_filter = 'all'
         if _current_filter == [c.pull_request_type]:
             c.current_filter = 'pull_request'
         elif _current_filter == c.comment_type:
             c.current_filter = 'comment'
         return render('admin/notifications/notifications.html')
     def mark_all_read(self):
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             nm = NotificationModel()
             # mark all read
             nm.mark_all_read_for_user(self.rhodecode_user.user_id,
                                       filter_=request.GET.getall('type'))
             Session.commit()
             c.user = self.rhodecode_user
             notif = nm.get_for_user(self.rhodecode_user.user_id,
                                     filter_=request.GET.getall('type'))
             c.notifications = Page(notif, page=1, items_per_page=10)
             return render('admin/notifications/notifications_data.html')
     def create(self):
         """POST /_admin/notifications: Create a new item"""
         # url('notifications')
     def new(self, format='html'):
         """GET /_admin/notifications/new: Form to create a new item"""
         # url('new_notification')
     def update(self, notification_id):
         """PUT /_admin/notifications/id: Update an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('notification', notification_id=ID),
         #           method='put')
         # url('notification', notification_id=ID)
         try:
             no = Notification.get(notification_id)
             owner = lambda: (no.notifications_to_users.user.user_id
                              == c.rhodecode_user.user_id)
             if h.HasPermissionAny('hg.admin')() or owner:
                     NotificationModel().mark_read(c.rhodecode_user.user_id, no)
                     Session.commit()
                     return 'ok'
         except Exception:
             Session.rollback()
             log.error(traceback.format_exc())
         return 'fail'
     def delete(self, notification_id):
         """DELETE /_admin/notifications/id: Delete an existing item"""
         # Forms posted to this method should contain a hidden field:
         #    <input type="hidden" name="_method" value="DELETE" />
         # Or using helpers:
         #    h.form(url('notification', notification_id=ID),
         #           method='delete')
         # url('notification', notification_id=ID)
         try:
             no = Notification.get(notification_id)
             owner = lambda: (no.notifications_to_users.user.user_id
                              == c.rhodecode_user.user_id)
-            if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner:
             if h.HasPermissionAny('hg.admin')() or owner:
                     NotificationModel().delete(c.rhodecode_user.user_id, no)
                     Session.commit()
                     return 'ok'
         except Exception:
             Session.rollback()
             log.error(traceback.format_exc())
         return 'fail'
     def show(self, notification_id, format='html'):
         """GET /_admin/notifications/id: Show a specific item"""
         # url('notification', notification_id=ID)
         c.user = self.rhodecode_user
         no = Notification.get(notification_id)
         owner = lambda: (no.notifications_to_users.user.user_id
                          == c.user.user_id)
         if no and (h.HasPermissionAny('hg.admin', 'repository.admin')() or owner):
             unotification = NotificationModel()\
                             .get_user_notification(c.user.user_id, no)
             # if this association to user is not valid, we don't want to show
             # this message
             if unotification:
                 if unotification.read is False:
                     unotification.mark_as_read()
                     Session.commit()
                 c.notification = no
                 return render('admin/notifications/show_notification.html')
         return redirect(url('notifications'))
     def edit(self, notification_id, format='html'):
         """GET /_admin/notifications/id/edit: Form to edit an existing item"""
         # url('edit_notification', notification_id=ID)

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -111,96 +111,113 @@ class NotificationModel(BaseModel): @@
             ## this is passed into template
             kwargs = {'subject': subject, 'body': h.rst_w_mentions(body)}
             kwargs.update(email_kwargs)
             email_body_html = EmailNotificationModel()\
                                 .get_email_tmpl(type_, **kwargs)
             run_task(tasks.send_email, rec.email, email_subject, email_body,
                      email_body_html)
         return notif
     def delete(self, user, notification):
         # we don't want to remove actual notification just the assignment
         try:
             notification = self.__get_notification(notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query()\
                         .filter(UserNotification.user == user)\
                         .filter(UserNotification.notification
                                 == notification)\
                         .one()
                 self.sa.delete(obj)
                 return True
         except Exception:
             log.error(traceback.format_exc())
             raise
     def get_for_user(self, user, filter_=None):
         """
         Get mentions for given user, filter them if filter dict is given
         :param user:
         :type user:
         :param filter:
         """
         user = self._get_user(user)
         q = UserNotification.query()\
             .filter(UserNotification.user == user)\
             .join((Notification, UserNotification.notification_id ==
                                  Notification.notification_id))
         if filter_:
             q = q.filter(Notification.type_.in_(filter_))
         return q.all()
     def mark_read(self, user, notification):
         try:
             notification = self.__get_notification(notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query()\
                         .filter(UserNotification.user == user)\
                         .filter(UserNotification.notification
                                 == notification)\
                         .one()
                 obj.read = True
                 self.sa.add(obj)
                 return True
         except Exception:
             log.error(traceback.format_exc())
             raise
     def mark_all_read_for_user(self, user, filter_=None):
         user = self._get_user(user)
         q = UserNotification.query()\
             .filter(UserNotification.user == user)\
             .filter(UserNotification.read == False)\
             .join((Notification, UserNotification.notification_id ==
                                  Notification.notification_id))
         if filter_:
             q = q.filter(Notification.type_.in_(filter_))
         # this is a little inefficient but sqlalchemy doesn't support
         # update on joined tables :(
         for obj in q.all():
             obj.read = True
             self.sa.add(obj)
     def get_unread_cnt_for_user(self, user):
         user = self._get_user(user)
         return UserNotification.query()\
                 .filter(UserNotification.read == False)\
                 .filter(UserNotification.user == user).count()
     def get_unread_for_user(self, user):
         user = self._get_user(user)
         return [x.notification for x in UserNotification.query()\
                 .filter(UserNotification.read == False)\
                 .filter(UserNotification.user == user).all()]
     def get_user_notification(self, user, notification):
         user = self._get_user(user)
         notification = self.__get_notification(notification)
         return UserNotification.query()\
             .filter(UserNotification.notification == notification)\
             .filter(UserNotification.user == user).scalar()
     def make_description(self, notification, show_age=True):
         """
         Creates a human readable description based on properties
         of notification object
         """
         #alias
         _n = notification
         _map = {
             _n.TYPE_CHANGESET_COMMENT: _('commented on commit'),
             _n.TYPE_MESSAGE: _('sent message'),
             _n.TYPE_MENTION: _('mentioned you'),
             _n.TYPE_REGISTRATION: _('registered in RhodeCode'),

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2957,96 +2957,103 @@ table.code-browser .submodule-dir { @@
+}
 .ac .yui-ac-content li.yui-ac-prehighlight {
 	background: #B3D4FF;
 	z-index: 9050;
+}
 .ac .yui-ac-content li.yui-ac-highlight {
 	background: #556CB5;
 	color: #FFF;
 	z-index: 9050;
+}
 .ac .yui-ac-bd{
 	z-index: 9050;
+}
 .follow {
 	background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
+}
 .following {
 	background: url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
+}
 .currently_following {
 	padding-left: 10px;
 	padding-bottom: 5px;
+}
 .add_icon {
 	background: url("../images/icons/add.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
+}
 .accept_icon {
     background: url("../images/icons/accept.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .edit_icon {
 	background: url("../images/icons/folder_edit.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
+}
 .delete_icon {
 	background: url("../images/icons/delete.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
+}
 .refresh_icon {
 	background: url("../images/icons/arrow_refresh.png") no-repeat scroll
 px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
+}
 .pull_icon {
 	background: url("../images/icons/connect.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 0px;
 	text-align: left;
+}
 .rss_icon {
 	background: url("../images/icons/rss_16.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 4px;
 	text-align: left;
 	font-size: 8px
+}
 .atom_icon {
 	background: url("../images/icons/atom.png") no-repeat scroll 3px;
 	padding-left: 20px;
 	padding-top: 4px;
 	text-align: left;
 	font-size: 8px
+}
 .archive_icon {
 	background: url("../images/icons/compress.png") no-repeat scroll 3px;
 	padding-left: 20px;
@@ @@ -4235,113 +4242,118 @@ form.comment-inline-form { @@
 	margin:2px 0px 8px 5px !important
+}
 .notification-paginator{
     padding: 0px 0px 4px 16px;
     float: left;
+}
 .notifications{
     border-radius: 4px 4px 4px 4px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     float: right;
     margin: 20px 0px 0px 0px;
     position: absolute;
     text-align: center;
     width: 26px;
     z-index: 1000;
+}
 .notifications a{
 	color:#888 !important;
 	display: block;
 	font-size: 10px;
 	background-color: #DEDEDE !important;
     border-radius: 2px !important;
     -webkit-border-radius: 2px !important;
     -moz-border-radius: 2px !important;
+}
 .notifications a:hover{
 	text-decoration: none !important;
 	background-color: #EEEFFF !important;
+}
 .notification-header{
 	padding-top:6px;
+}
 .notification-header .desc{
 	font-size: 16px;
     height: 24px;
     float: left
+}
 .notification-list .container.unread{
 	background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6);
+}
 .notification-header .gravatar{
     background: none repeat scroll 0 0 transparent;
     padding: 0px 0px 0px 8px;
+}
-.notification-header .desc.unread{
+.notification-list .container .notification-header .desc{
     font-weight: bold;
     font-size: 17px;
+}
 .notification-table{
 	border: 1px solid #ccc;
     -webkit-border-radius: 6px 6px 6px 6px;
     -moz-border-radius: 6px 6px 6px 6px;
     border-radius: 6px 6px 6px 6px;
     clear: both;
     margin: 0px 20px 0px 20px;
+}
 .notification-header .delete-notifications{
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-header .read-notifications{
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-subject{
     clear:both;
     border-bottom: 1px solid #eee;
     padding:5px 0px 5px 38px;
+}
 .notification-body{
 	clear:both;
 	margin: 34px 2px 2px 8px
+}
 /****
   PERMS
 *****/
 #perms .perms_section_head {
    padding:10px 10px 10px 0px;
    font-size:16px;
    font-weight: bold;
+}
 #perms .perm_tag{
   padding: 1px 3px 1px 3px;
   font-size: 10px;
   font-weight: bold;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+}
 #perms .perm_tag.admin{
   background-color: #B94A48;
   color: #ffffff;
+}
 #perms .perm_tag.write{
   background-color: #B94A48;
   color: #ffffff;
+}
 #perms .perm_tag.read{
   background-color: #468847;
   color: #ffffff;
+}
 #perms .perm_tag.none{
   background-color: #bfbfbf;

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -794,96 +794,117 @@ var getSelectionLink = function(selecti @@
 	        if (ranges[0] != ranges[1]){
 	            if(YUD.get('linktt') == null){
 	                hl_div = document.createElement('div');
 	                hl_div.id = 'linktt';
+	            }
 	            anchor = '#L'+ranges[0]+'-'+ranges[1];
 	            hl_div.innerHTML = '';
 	            l = document.createElement('a');
 	            l.href = location.href.substring(0,location.href.indexOf('#'))+anchor;
 	            l.innerHTML = selection_link_label;
 	            hl_div.appendChild(l);
 	            YUD.get('body').appendChild(hl_div);
 	            xy = YUD.getXY(till.id);
 	            YUD.addClass('linktt','yui-tt');
 	            YUD.setStyle('linktt','top',xy[1]+offset+'px');
 	            YUD.setStyle('linktt','left',xy[0]+'px');
 	            YUD.setStyle('linktt','visibility','visible');
+	        }
 	        else{
 	        	YUD.setStyle('linktt','visibility','hidden');
+	        }
+	    }
+	}
 };
 var deleteNotification = function(url, notification_id,callbacks){
     var callback = {
 		success:function(o){
 		    var obj = YUD.get(String("notification_"+notification_id));
 		    if(obj.parentNode !== undefined){
 				obj.parentNode.removeChild(obj);
+			}
 			_run_callbacks(callbacks);
 		},
 	    failure:function(o){
 	        alert("error");
 	    },
 	};
     var postData = '_method=delete';
     var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl,
     											  callback, postData);
 };
 var readNotification = function(url, notification_id,callbacks){
     var callback = {
 		success:function(o){
 		    var obj = YUD.get(String("notification_"+notification_id));
 		    YUD.removeClass(obj, 'unread');
 		    var r_button = obj.children[0].getElementsByClassName('read-notification')[0]
 		    if(r_button.parentNode !== undefined){
 		    	r_button.parentNode.removeChild(r_button);
+			}
 			_run_callbacks(callbacks);
 		},
 	    failure:function(o){
 	        alert("error");
 	    },
 	};
     var postData = '_method=put';
     var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);
     var request = YAHOO.util.Connect.asyncRequest('POST', sUrl,
     											  callback, postData);
 };
 /** MEMBERS AUTOCOMPLETE WIDGET **/
 var MembersAutoComplete = function (users_list, groups_list) {
     var myUsers = users_list;
     var myGroups = groups_list;
     // Define a custom search function for the DataSource of users
     var matchUsers = function (sQuery) {
             // Case insensitive matching
             var query = sQuery.toLowerCase();
             var i = 0;
             var l = myUsers.length;
             var matches = [];
             // Match against each name of each contact
             for (; i < l; i++) {
                 contact = myUsers[i];
                 if (((contact.fname+"").toLowerCase().indexOf(query) > -1) ||
                    	 ((contact.lname+"").toLowerCase().indexOf(query) > -1) ||
                    	 ((contact.nname) && ((contact.nname).toLowerCase().indexOf(query) > -1))) {
                        matches[matches.length] = contact;
+                   }
+            }
             return matches;
         };
     // Define a custom search function for the DataSource of usersGroups
     var matchGroups = function (sQuery) {
             // Case insensitive matching
             var query = sQuery.toLowerCase();
             var i = 0;
             var l = myGroups.length;
             var matches = [];
             // Match against each name of each contact
             for (; i < l; i++) {
                 matched_group = myGroups[i];
                 if (matched_group.grname.toLowerCase().indexOf(query) > -1) {
                     matches[matches.length] = matched_group;
+                }
+            }
             return matches;
         };
     //match all
     var matchAll = function (sQuery) {
             u = matchUsers(sQuery);

rhodecode/templates/admin/notifications/notifications.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('My Notifications')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('My Notifications')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         ##<ul class="links">
         ##    <li>
         ##      <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
         ##    </li>
         ##</ul>
     </div>
       <div style="padding:14px 18px;text-align: right;float:left">
       <span id='all' class="ui-btn"><a href="${h.url.current()}">${_('All')}</a></span>
       <span id='comment' class="ui-btn"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
       <span id='pull_request' class="ui-btn"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull requests')}</a></span>
       </div>
       %if c.notifications:
       <div style="padding:14px 18px;text-align: right;float:right">
       <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>
       </div>
       %endif
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
 var url_del = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 var url_action = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 var run = function(){
 YUE.on(YUQ('.delete-notification'),'click',function(e){
  var notification_id = e.currentTarget.id;
- deleteNotification(url_del,notification_id)
+   deleteNotification(url_action,notification_id)
 })
   YUE.on(YUQ('.read-notification'),'click',function(e){
      var notification_id = e.currentTarget.id;
      readNotification(url_action,notification_id)
   })
+}
 run()
 YUE.on('mark_all_read','click',function(e){
     var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";
     ypjax(url,'notification_data',function(){
     	YUE.on(YUQ('.delete-notification'),'click',function(e){
     		 var notification_id = e.currentTarget.id;
     		 deleteNotification(url_del,notification_id)
     	})
     });
     ypjax(url,'notification_data',function(){run()});
 })
 var current_filter = "${c.current_filter}";
 if (YUD.get(current_filter)){
 	YUD.addClass(current_filter, 'active');
+}
 console.log(current_filter);
 </script>
 </%def>

rhodecode/templates/admin/notifications/notifications_data.html

➞

Show inline comments

 %if c.notifications:
 <%
 unread = lambda n:{False:'unread'}.get(n)
 %>
 <div class="notification-list  notification-table">
 %for notification in c.notifications:
   <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}">
     <div class="notification-header">
       <div class="gravatar">
           <img alt="gravatar" src="${h.gravatar_url(h.email(notification.notification.created_by_user.email),24)}"/>
       </div>
       <div class="desc ${unread(notification.read)}">
       <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a>
       </div>
       <div class="delete-notifications">
         <span id="${notification.notification.notification_id}" class="delete-notification delete_icon action"></span>
       </div>
       %if not notification.read:
       <div class="read-notifications">
         <span id="${notification.notification.notification_id}" class="read-notification accept_icon action"></span>
       </div>
       %endif
     </div>
     <div class="notification-subject">${h.literal(notification.notification.subject)}</div>
   </div>
 %endfor
 </div>
 <div class="notification-paginator">
   <div class="pagination-wh pagination-left">
   ${c.notifications.pager('$link_previous ~2~ $link_next',**request.GET.mixed())}
   </div>
 </div>
 %else:
     <div class="table">${_('No notifications here yet')}</div>
 %endif

0 comments (0 inline, 0 general)