kallithea Changeset - 4a7de41dc22a

Changeset - 4a7de41dc22a

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-01-27 04:07:57
marcin@python-works.com

show members in user groups with avatars

3 files changed with 74 insertions and 42 deletions:

rhodecode/controllers/admin/users_groups.py

rhodecode/public/css/style.css

rhodecode/templates/admin/users_groups/users_group_edit.html

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/users_groups.py

➞

Show inline comments

@@ @@ -105,14 +105,15 @@ class UsersGroupsController(BaseControll @@
         # Or using helpers:
         #    h.form(url('users_group', id=ID),
         #           method='put')
         # url('users_group', id=ID)
         c.users_group = UsersGroup.get(id)
         c.group_members = [(x.user_id, x.user.username) for x in
                            c.users_group.members]
         c.group_members_obj = [x.user for x in c.users_group.members]
         c.group_members = [(x.user_id, x.username) for x in
                            c.group_members_obj]
         c.available_members = [(x.user_id, x.username) for x in
                                self.sa.query(User).all()]
         available_members = [safe_unicode(x[0]) for x in c.available_members]
@@ @@ -178,14 +179,15 @@ class UsersGroupsController(BaseControll @@
         c.users_group = self.sa.query(UsersGroup).get(id)
         if not c.users_group:
             return redirect(url('users_groups'))
         c.users_group.permissions = {}
         c.group_members = [(x.user_id, x.user.username) for x in
                            c.users_group.members]
         c.group_members_obj = [x.user for x in c.users_group.members]
         c.group_members = [(x.user_id, x.username) for x in
                            c.group_members_obj]
         c.available_members = [(x.user_id, x.username) for x in
                                self.sa.query(User).all()]
         defaults = c.users_group.get_dict()
         perm = Permission.get_by_key('hg.create.repository')
         defaults.update({'create_repo_perm':
                          UsersGroupModel().has_perm(c.users_group, perm)})

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -3636,12 +3636,22 @@ div#legend_container table td,div#legend @@
 #node_filter {
 	border: 0px solid #545454;
 	color: #AAAAAA;
 	padding-left: 3px;
+}
 .group_members_wrap{
+}
 .group_members .group_member{
 	height: 30px;
 	padding:0px 0px 0px 10px;
+}
 /*README STYLE*/
 div.readme {
 	padding:0px;
+}

rhodecode/templates/admin/users_groups/users_group_edit.html

➞

Show inline comments

@@ @@ -91,12 +91,57 @@ @@
                 </div>
             </div>
     </div>
 ${h.end_form()}
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Permissions')}</h5>
     </div>
     ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Group members')}</h5>
     </div>
     <div class="group_members_wrap">
       <ul class="group_members">
       %for user in c.group_members_obj:
         <li>
           <div class="group_member">
             <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div>
             <div>${user.username}</div>
             <div>${user.full_name}</div>
           </div>
         </li>
       %endfor
       </ul>
     </div>
 </div>
 <script type="text/javascript">
     YAHOO.util.Event.onDOMReady(function(){
             var D = YAHOO.util.Dom;
             var E = YAHOO.util.Event;
             //definition of containers ID's
@@ @@ -137,22 +182,22 @@ ${h.end_form()} @@
             //fill available only with those not in choosen
             ac.options.length=0;
             tmp_cache = new Array();
             for(var i = 0;node = av_cache[i];i++){
             	var add = true;
 	            for(var i2 = 0;node_2 = cache[i2];i2++){
 	                if(node.value == node_2.value){
 	                	add=false;
 	                	break;
+	                }
+	            }
 	            if(add){
 	            	tmp_cache.push(new Option(node.text, node.value, false, false));
+	            }
                 var add = true;
                 for(var i2 = 0;node_2 = cache[i2];i2++){
                     if(node.value == node_2.value){
                         add=false;
                         break;
+                    }
+                }
                 if(add){
                     tmp_cache.push(new Option(node.text, node.value, false, false));
+                }
+            }
             for(var i = 0;node = tmp_cache[i];i++){
                 ac.options[i] = node;
+            }
@@ @@ -170,23 +215,23 @@ ${h.end_form()} @@
                     for(var i = 0;node = from_field.options[i];i++){
                         if(node.selected){
                             //push selected fields :)
                             sel_cache.push(node);
+                        }
                         else{
-                        	oth_cache.push(node)
+                            oth_cache.push(node)
+                        }
+                    }
                     return [sel_cache,oth_cache]
+                }
                 //fill the field with given options
                 function fill_with(field,options){
                 	//clear firtst
                 	field.options.length=0;
                     //clear firtst
                     field.options.length=0;
                     for(var i = 0;node = options[i];i++){
                             field.options[i]=new Option(node.text, node.value,
                                     false, false);
+                    }
+                }
@@ @@ -239,32 +284,7 @@ ${h.end_form()} @@
                 for (var i = 0; i < choosen.options.length; i++) {
                     choosen.options[i].selected = 'selected';
+                }
             })
         });
 </script>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Permissions')}</h5>
     </div>
     ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 </%def>

0 comments (0 inline, 0 general)