particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hide Maven-specific UI if Maven support is not enabled

Browse source
This commit is contained in:
Mike Bonnet 2010-07-06 14:30:10 -04:00
parent 71bf4fcc81
commit 424de47845
8 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
www/kojiweb/builds.chtml
View file

@ -42,14 +42,19 @@
#end for
</select>
</td></tr>
<tr><td>
#if $tag or $mavenEnabled
<tr>
#if $mavenEnabled
<td>
<strong>Type</strong>:
</td><td>
</td>
<td>
<select name="type" class="filterlist" onchange="javascript: window.location='builds?type=' + this.value + '$util.passthrough_except($self, 'type')';">
<option value="all" #if not $type then 'selected="selected"' else ''#>all</option>
<option value="maven" #if $type == 'maven' then 'selected="selected"' else ''#>Maven</option>
</select>
</td>
#end if
#if $tag
<td>
<strong>Inherited</strong>:
@ -61,6 +66,7 @@
</td>
#end if
</tr>
#end if
</table>
</td>
</tr>

2
www/kojiweb/includes/header.chtml
View file

@ -56,7 +56,9 @@
<option value="user">Users</option>
<option value="host">Hosts</option>
<option value="rpm">RPMs</option>
#if $mavenEnabled
<option value="maven">Maven Artifacts</option>
#end if
</select>
<input type="text" name="terms"/>
<input type="submit" value="Search"/>

21
www/kojiweb/index.py
View file

@ -837,17 +837,21 @@ def tagcreate(req):
server = _getServer(req)
_assertLogin(req)
mavenEnabled = server.mavenEnabled()
form = req.form
if form.has_key('add'):
params = {}
name = form['name'].value
params['arches'] = form['arches'].value
params['locked'] = form.has_key('locked')
params['locked'] = bool(form.has_key('locked'))
permission = form['permission'].value
if permission != 'none':
params['perm'] = int(permission)
params['maven_support'] = form.has_key('maven_support')
if mavenEnabled:
params['maven_support'] = bool(form.has_key('maven_support'))
params['maven_include_all'] = bool(form.has_key('maven_include_all'))
tagID = server.createTag(name, **params)
@ -857,6 +861,8 @@ def tagcreate(req):
else:
values = _initValues(req, 'Add Tag', 'tags')
values['mavenEnabled'] = mavenEnabled
values['tag'] = None
values['permissions'] = server.getAllPerms()
@ -866,6 +872,8 @@ def tagedit(req, tagID):
server = _getServer(req)
_assertLogin(req)
mavenEnabled = server.mavenEnabled()
tagID = int(tagID)
tag = server.getTag(tagID)
if tag == None:
@ -877,12 +885,13 @@ def tagedit(req, tagID):
params = {}
params['name'] = form['name'].value
params['arches'] = form['arches'].value
params['locked'] = form.has_key('locked')
params['locked'] = bool(form.has_key('locked'))
permission = form['permission'].value
if permission != 'none':
params['perm'] = int(permission)
params['maven_support'] = form.has_key('maven_support')
params['maven_include_all'] = form.has_key('maven_include_all')
if mavenEnabled:
params['maven_support'] = bool(form.has_key('maven_support'))
params['maven_include_all'] = bool(form.has_key('maven_include_all'))
server.editTag2(tag['id'], **params)
@ -892,6 +901,8 @@ def tagedit(req, tagID):
else:
values = _initValues(req, 'Edit Tag', 'tags')
values['mavenEnabled'] = mavenEnabled
values['tag'] = tag
values['permissions'] = server.getAllPerms()

2
www/kojiweb/search.chtml
View file

@ -21,7 +21,9 @@
<option value="user">Users</option>
<option value="host">Hosts</option>
<option value="rpm">RPMs</option>
#if $mavenEnabled
<option value="maven">Maven Artifacts</option>
#end if
</select>
</td>
</tr>

2
www/kojiweb/tagedit.chtml
View file

@ -39,6 +39,7 @@
</select>
</td>
</tr>
#if $mavenEnabled
<tr>
<th>Maven Support?</th>
<td><input type="checkbox" name="maven_support" value="yes" #if $tag and $tag.maven_support then 'checked="checked"' else ''#>
@ -47,6 +48,7 @@
<th>Include All Maven Builds?</th>
<td><input type="checkbox" name="maven_include_all" value="yes" #if $tag and $tag.maven_include_all then 'checked="checked"' else ''#>
</tr>
#end if
<tr>
<td>
#if $tag

2
www/kojiweb/taginfo.chtml
View file

@ -25,12 +25,14 @@
<tr>
<th>Permission</th><td>#if $tag.perm_id then $allPerms[$tag.perm_id] else 'none'#</td>
</tr>
#if $mavenEnabled
<tr>
<th>Maven Support?</th><td class="$str($tag.maven_support).lower()">#if $tag.maven_support then 'yes' else 'no'#</td>
</tr>
<tr>
<th>Include All Maven Builds?</th><td class="$str($tag.maven_include_all).lower()">#if $tag.maven_include_all then 'yes' else 'no'#</td>
</tr>
#end if
<tr>
<th>Inheritance</th>
<td class="tree">

4
www/kojiweb/tasks.chtml
View file

@ -79,7 +79,11 @@ All
<select name="method" class="filterlist" onchange="javascript: window.location = 'tasks?method=' + this.value + '$util.passthrough_except($self, 'method')';">
<option value="all" $util.toggleSelected($self, $method, 'all')>all</option>
#for $task_type in $alltasks
#if $task_type in ('maven', 'buildMaven') and not $mavenEnabled
#continue
#else
<option value="$task_type" #if $method == $task_type then 'selected="selected"' else ''#>$task_type</option>
#end if
#end for
</select>
</td><td>

2
www/lib/kojiweb/util.py
View file

@ -65,6 +65,8 @@ def _genHTML(req, fileName):
else:
req._values['currentUser'] = None
req._values['authToken'] = _genToken(req)
if not req._values.has_key('mavenEnabled'):
req._values['mavenEnabled'] = req._session.mavenEnabled()
tmpl_class = TEMPLATES.get(fileName)
if not tmpl_class: