Show More
@@ -108,8 +108,9 b' class UsersGroupsController(BaseControll' | |||||
108 | # url('users_group', id=ID) |
|
108 | # url('users_group', id=ID) | |
109 |
|
109 | |||
110 | c.users_group = UsersGroup.get(id) |
|
110 | c.users_group = UsersGroup.get(id) | |
111 |
c.group_members = [ |
|
111 | c.group_members_obj = [x.user for x in c.users_group.members] | |
112 | c.users_group.members] |
|
112 | c.group_members = [(x.user_id, x.username) for x in | |
|
113 | c.group_members_obj] | |||
113 |
|
114 | |||
114 | c.available_members = [(x.user_id, x.username) for x in |
|
115 | c.available_members = [(x.user_id, x.username) for x in | |
115 | self.sa.query(User).all()] |
|
116 | self.sa.query(User).all()] | |
@@ -181,8 +182,9 b' class UsersGroupsController(BaseControll' | |||||
181 | return redirect(url('users_groups')) |
|
182 | return redirect(url('users_groups')) | |
182 |
|
183 | |||
183 | c.users_group.permissions = {} |
|
184 | c.users_group.permissions = {} | |
184 |
c.group_members = [ |
|
185 | c.group_members_obj = [x.user for x in c.users_group.members] | |
185 | c.users_group.members] |
|
186 | c.group_members = [(x.user_id, x.username) for x in | |
|
187 | c.group_members_obj] | |||
186 | c.available_members = [(x.user_id, x.username) for x in |
|
188 | c.available_members = [(x.user_id, x.username) for x in | |
187 | self.sa.query(User).all()] |
|
189 | self.sa.query(User).all()] | |
188 | defaults = c.users_group.get_dict() |
|
190 | defaults = c.users_group.get_dict() |
@@ -3639,6 +3639,16 b' div#legend_container table td,div#legend' | |||||
3639 | padding-left: 3px; |
|
3639 | padding-left: 3px; | |
3640 | } |
|
3640 | } | |
3641 |
|
3641 | |||
|
3642 | ||||
|
3643 | .group_members_wrap{ | |||
|
3644 | ||||
|
3645 | } | |||
|
3646 | ||||
|
3647 | .group_members .group_member{ | |||
|
3648 | height: 30px; | |||
|
3649 | padding:0px 0px 0px 10px; | |||
|
3650 | } | |||
|
3651 | ||||
3642 | /*README STYLE*/ |
|
3652 | /*README STYLE*/ | |
3643 |
|
3653 | |||
3644 | div.readme { |
|
3654 | div.readme { |
@@ -94,6 +94,51 b'' | |||||
94 | ${h.end_form()} |
|
94 | ${h.end_form()} | |
95 | </div> |
|
95 | </div> | |
96 |
|
96 | |||
|
97 | <div class="box box-right"> | |||
|
98 | <!-- box / title --> | |||
|
99 | <div class="title"> | |||
|
100 | <h5>${_('Permissions')}</h5> | |||
|
101 | </div> | |||
|
102 | ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')} | |||
|
103 | <div class="form"> | |||
|
104 | <!-- fields --> | |||
|
105 | <div class="fields"> | |||
|
106 | <div class="field"> | |||
|
107 | <div class="label label-checkbox"> | |||
|
108 | <label for="create_repo_perm">${_('Create repositories')}:</label> | |||
|
109 | </div> | |||
|
110 | <div class="checkboxes"> | |||
|
111 | ${h.checkbox('create_repo_perm',value=True)} | |||
|
112 | </div> | |||
|
113 | </div> | |||
|
114 | <div class="buttons"> | |||
|
115 | ${h.submit('save',_('Save'),class_="ui-button")} | |||
|
116 | ${h.reset('reset',_('Reset'),class_="ui-button")} | |||
|
117 | </div> | |||
|
118 | </div> | |||
|
119 | </div> | |||
|
120 | ${h.end_form()} | |||
|
121 | </div> | |||
|
122 | ||||
|
123 | <div class="box box-right"> | |||
|
124 | <!-- box / title --> | |||
|
125 | <div class="title"> | |||
|
126 | <h5>${_('Group members')}</h5> | |||
|
127 | </div> | |||
|
128 | <div class="group_members_wrap"> | |||
|
129 | <ul class="group_members"> | |||
|
130 | %for user in c.group_members_obj: | |||
|
131 | <li> | |||
|
132 | <div class="group_member"> | |||
|
133 | <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div> | |||
|
134 | <div>${user.username}</div> | |||
|
135 | <div>${user.full_name}</div> | |||
|
136 | </div> | |||
|
137 | </li> | |||
|
138 | %endfor | |||
|
139 | </ul> | |||
|
140 | </div> | |||
|
141 | </div> | |||
97 | <script type="text/javascript"> |
|
142 | <script type="text/javascript"> | |
98 | YAHOO.util.Event.onDOMReady(function(){ |
|
143 | YAHOO.util.Event.onDOMReady(function(){ | |
99 | var D = YAHOO.util.Dom; |
|
144 | var D = YAHOO.util.Dom; | |
@@ -140,16 +185,16 b'' | |||||
140 | tmp_cache = new Array(); |
|
185 | tmp_cache = new Array(); | |
141 |
|
186 | |||
142 | for(var i = 0;node = av_cache[i];i++){ |
|
187 | for(var i = 0;node = av_cache[i];i++){ | |
143 |
|
|
188 | var add = true; | |
144 |
|
|
189 | for(var i2 = 0;node_2 = cache[i2];i2++){ | |
145 |
|
|
190 | if(node.value == node_2.value){ | |
146 |
|
|
191 | add=false; | |
147 |
|
|
192 | break; | |
148 |
|
|
193 | } | |
149 |
|
|
194 | } | |
150 |
|
|
195 | if(add){ | |
151 |
|
|
196 | tmp_cache.push(new Option(node.text, node.value, false, false)); | |
152 |
|
|
197 | } | |
153 | } |
|
198 | } | |
154 |
|
199 | |||
155 | for(var i = 0;node = tmp_cache[i];i++){ |
|
200 | for(var i = 0;node = tmp_cache[i];i++){ | |
@@ -173,7 +218,7 b'' | |||||
173 | sel_cache.push(node); |
|
218 | sel_cache.push(node); | |
174 | } |
|
219 | } | |
175 | else{ |
|
220 | else{ | |
176 |
|
|
221 | oth_cache.push(node) | |
177 | } |
|
222 | } | |
178 | } |
|
223 | } | |
179 |
|
224 | |||
@@ -182,8 +227,8 b'' | |||||
182 |
|
227 | |||
183 | //fill the field with given options |
|
228 | //fill the field with given options | |
184 | function fill_with(field,options){ |
|
229 | function fill_with(field,options){ | |
185 |
|
|
230 | //clear firtst | |
186 |
|
|
231 | field.options.length=0; | |
187 | for(var i = 0;node = options[i];i++){ |
|
232 | for(var i = 0;node = options[i];i++){ | |
188 | field.options[i]=new Option(node.text, node.value, |
|
233 | field.options[i]=new Option(node.text, node.value, | |
189 | false, false); |
|
234 | false, false); | |
@@ -242,29 +287,4 b'' | |||||
242 | }) |
|
287 | }) | |
243 | }); |
|
288 | }); | |
244 | </script> |
|
289 | </script> | |
245 | <div class="box box-right"> |
|
|||
246 | <!-- box / title --> |
|
|||
247 | <div class="title"> |
|
|||
248 | <h5>${_('Permissions')}</h5> |
|
|||
249 | </div> |
|
|||
250 | ${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')} |
|
|||
251 | <div class="form"> |
|
|||
252 | <!-- fields --> |
|
|||
253 | <div class="fields"> |
|
|||
254 | <div class="field"> |
|
|||
255 | <div class="label label-checkbox"> |
|
|||
256 | <label for="create_repo_perm">${_('Create repositories')}:</label> |
|
|||
257 | </div> |
|
|||
258 | <div class="checkboxes"> |
|
|||
259 | ${h.checkbox('create_repo_perm',value=True)} |
|
|||
260 | </div> |
|
|||
261 | </div> |
|
|||
262 | <div class="buttons"> |
|
|||
263 | ${h.submit('save',_('Save'),class_="ui-button")} |
|
|||
264 | ${h.reset('reset',_('Reset'),class_="ui-button")} |
|
|||
265 | </div> |
|
|||
266 | </div> |
|
|||
267 | </div> |
|
|||
268 | ${h.end_form()} |
|
|||
269 | </div> |
|
|||
270 | </%def> |
|
290 | </%def> |
General Comments 0
You need to be logged in to leave comments.
Login now