kallithea Changeset - 2aee0dc1784e

Changeset - 2aee0dc1784e

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 1

Marcin Kuzminski - 14 years ago 2011-12-19 01:31:22
marcin@python-works.com

mark all read button for notifications

6 files changed with 65 insertions and 37 deletions:

rhodecode/config/routing.py

rhodecode/controllers/admin/notifications.py

rhodecode/model/notification.py

rhodecode/templates/admin/notifications/notifications.html

rhodecode/templates/admin/notifications/notifications_data.html

rhodecode/templates/base/base.html

0 comments (0 inline, 0 general)

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -23,32 +23,31 @@ def make_map(config): @@
     from rhodecode.lib.utils import is_valid_repo
     from rhodecode.lib.utils import is_valid_repos_group
     def check_repo(environ, match_dict):
         """
         check for valid repository for proper 404 handling
         :param environ:
         :param match_dict:
         """
         repo_name = match_dict.get('repo_name')
         return is_valid_repo(repo_name, config['base_path'])
     def check_group(environ, match_dict):
         """
         check for valid repositories group for proper 404 handling
         :param environ:
         :param match_dict:
         """
         repos_group_name = match_dict.get('group_name')
         return is_valid_repos_group(repos_group_name, config['base_path'])
     def check_int(environ, match_dict):
         return match_dict.get('id').isdigit()
     # The ErrorController route (handles 404/500 error pages); it should
     # likely stay at the top, ensuring it can always be resolved
     rmap.connect('/error/{action}', controller='error')
@@ @@ -271,20 +270,21 @@ def make_map(config): @@
                   action="my_account", conditions=dict(method=["GET"]))
         m.connect("admin_settings_my_account_update", "/my_account_update",
                   action="my_account_update", conditions=dict(method=["PUT"]))
         m.connect("admin_settings_create_repository", "/create_repository",
                   action="create_repository", conditions=dict(method=["GET"]))
     #NOTIFICATION REST ROUTES
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/notifications') as m:
         m.connect("notifications", "/notifications",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("notifications", "/notifications",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("notifications_mark_all_read", "/notifications/mark_all_read",
                   action="mark_all_read", conditions=dict(method=["GET"]))
         m.connect("formatted_notifications", "/notifications.{format}",
                   action="index", conditions=dict(method=["GET"]))
         m.connect("new_notification", "/notifications/new",
                   action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_notification", "/notifications/new.{format}",
                   action="new", conditions=dict(method=["GET"]))

rhodecode/controllers/admin/notifications.py

➞

Show inline comments

 import logging
 import traceback
 from pylons import request
 from pylons import tmpl_context as c, url
 from pylons.controllers.util import redirect
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import Notification
@@ @@ -12,33 +13,43 @@ from rhodecode.lib.auth import LoginRequ @@
 from rhodecode.lib import helpers as h
 from rhodecode.model.meta import Session
 log = logging.getLogger(__name__)
 class NotificationsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
     #     map.resource('notification', 'notifications', controller='_admin/notifications',
     #         path_prefix='/_admin', name_prefix='_admin_')
     @LoginRequired()
     @NotAnonymous()
     def __before__(self):
         super(NotificationsController, self).__before__()
     def index(self, format='html'):
         """GET /_admin/notifications: All items in the collection"""
         # url('notifications')
         c.user = self.rhodecode_user
         c.notifications = NotificationModel()\
                             .get_for_user(self.rhodecode_user.user_id)
         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)
             Session.commit()
             c.user = self.rhodecode_user
             c.notifications = nm.get_for_user(self.rhodecode_user.user_id)
             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"""

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -131,12 +131,18 @@ class NotificationModel(BaseModel): @@
             raise
     def get_for_user(self, user):
         user = self.__get_user(user)
         return user.notifications
     def mark_all_read_for_user(self, user):
         user = self.__get_user(user)
         UserNotification.query()\
             .filter(UserNotification.read==False)\
             .update({'read': True})
     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()

rhodecode/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -21,42 +21,25 @@ @@
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
             </li>
         </ul>
     </div>
     % if c.notifications:
     <%
     unread = lambda n:{False:'unread'}.get(n)
     %>
     <div class="table">
       <div class="notification-list">
       %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>
           </div>
           <div class="notification-subject">${h.literal(notification.notification.subject)}</div>
         </div>
       %endfor
       </div>
     </div>
     %else:
         <div class="table">${_('No notifications here yet')}</div>
     %endif
       <div style="padding:10px 15px;text-align: right">
       <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>
   </div>
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
 var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
    YUE.on(YUQ('.delete-notification'),'click',function(e){
 	   var notification_id = e.currentTarget.id;
 	   deleteNotification(url,notification_id)
    })
 YUE.on(YUQ('.delete-notification'),'click',function(e){
  var notification_id = e.currentTarget.id;
  deleteNotification(url,notification_id)
 })
  YUE.on('mark_all_read','click',function(e){
 	    var url = "${h.url('notifications_mark_all_read')}";
 	    ypjax(url,'notification_data',function(){YUD.get('notification_counter').innerHTML=0});
  })
 </script>
 </%def>

rhodecode/templates/admin/notifications/notifications_data.html

➞

Show inline comments

@@ new file 100644 @@
 % if c.notifications:
 <%
 unread = lambda n:{False:'unread'}.get(n)
 %>
 <div class="table">
   <div class="notification-list">
   %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>
       </div>
       <div class="notification-subject">${h.literal(notification.notification.subject)}</div>
     </div>
   %endfor
   </div>
 </div>
 %else:
     <div class="table">${_('No notifications here yet')}</div>
 %endif
@@ \ No newline at end of file @@

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -50,13 +50,13 @@ @@
               <a href="${h.url('public_journal')}">${_('Public journal')}</a>
           %else:
           	<div style="float: left">
             ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
             </div>
             <div class="notifications">
             <a href="${h.url('notifications')}">${c.unread_notifications}</a>
+            <a id="notification_counter" href="${h.url('notifications')}">${c.unread_notifications}</a>
             </div>
           %endif
           </div>
          </li>
          <li>
             <a href="${h.url('home')}">${_('Home')}</a>

0 comments (0 inline, 0 general)