Skip to content
This repository was archived by the owner on Jun 7, 2024. It is now read-only.

Commit 975e1ef

Browse files
mlistmlist
committed
extensive bug-fixing
1 parent 50a5f58 commit 975e1ef

File tree

14 files changed

+131
-29
lines changed

14 files changed

+131
-29
lines changed

‎GeneTracker/GeneTracker.iml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
<sourceFolder url="file://$MODULE_DIR$/grails-app/taglib" isTestSource="false" />
3939
<sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/grails-app/modules" isTestSource="false" />
41+
<sourceFolder url="file://$MODULE_DIR$/grails-app/utils" isTestSource="false" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/groovy" isTestSource="false" />
43+
<sourceFolder url="file://$MODULE_DIR$/test/integration" isTestSource="true" />
4144
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
4245
</content>
4346
<orderEntry type="inheritedJdk" />
@@ -73,9 +76,11 @@
7376
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-client-lib/jars/cloudfoundry-client-lib-0.7.5.jar!/" />
7477
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-caldecott-lib/jars/cloudfoundry-caldecott-lib-0.1.1.jar!/" />
7578
<root url="jar://$USER_HOME$/.grails/ivy-cache/mysql/mysql-connector-java/jars/mysql-connector-java-5.1.16.jar!/" />
79+
<root url="file://$MODULE_DIR$/lib" />
7680
</CLASSES>
7781
<JAVADOC />
7882
<SOURCES />
83+
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
7984
</library>
8085
</orderEntry>
8186
</component>

‎OpenLabAttachments/OpenLabAttachments.iml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<sourceFolder url="file://$MODULE_DIR$/grails-app/taglib" isTestSource="false" />
3636
<sourceFolder url="file://$MODULE_DIR$/test/unit" isTestSource="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/grails-app/services" isTestSource="false" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/groovy" isTestSource="false" />
40+
<sourceFolder url="file://$MODULE_DIR$/grails-app/utils" isTestSource="false" />
41+
<sourceFolder url="file://$MODULE_DIR$/test/integration" isTestSource="true" />
3842
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
3943
</content>
4044
<orderEntry type="inheritedJdk" />
@@ -70,9 +74,11 @@
7074
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-client-lib/jars/cloudfoundry-client-lib-0.7.5.jar!/" />
7175
<root url="jar://$USER_HOME$/.grails/ivy-cache/org.cloudfoundry/cloudfoundry-caldecott-lib/jars/cloudfoundry-caldecott-lib-0.1.1.jar!/" />
7276
<root url="jar://$USER_HOME$/.grails/ivy-cache/mysql/mysql-connector-java/jars/mysql-connector-java-5.1.16.jar!/" />
77+
<root url="file://$MODULE_DIR$/lib" />
7378
</CLASSES>
7479
<JAVADOC />
7580
<SOURCES />
81+
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
7682
</library>
7783
</orderEntry>
7884
</component>

‎OpenLabAttachments/grails-app/views/dataObjectAttachment/list.gsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</tbody>
8585
</table>
8686
<div class="pagination">
87-
<g:remotePaginate total="${dataObjectAttachmentInstanceTotal}?:0" params="${params}" />
87+
<g:remotePaginate total="${dataObjectAttachmentInstanceTotal?:0}" params="${params}" />
8888
</div>
8989
</div>
9090
<script type="text/javascript">

‎OpenLabBackend/test/unit/openlabbackend/UserSettingsControllerTests.groovy‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package openlabbackend
2+
3+
4+
5+
import grails.test.mixin.*
6+
import org.junit.*
7+
8+
/**
9+
* See the API for {@link grails.test.mixin.web.ControllerUnitTestMixin} for usage instructions
10+
*/
11+
@TestFor(UserSettingsController)
12+
class UserSettingsControllerTests {
13+
14+
void testSomething() {
15+
fail "Implement me"
16+
}
17+
}

‎OpenLabFrontend/grails-app/controllers/org/openlab/settings/SettingsController.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class SettingsController {
2929
* the corresponding result
3030
*/
3131
def updateShowResult = {
32-
def value = settingsService.getSetting(key: params.key)
32+
println params
33+
def value = settingsService.getSetting(key: params.key)
3334

3435
render (g.editInPlace(id: params.key, url: [action: 'editField', id: params.key], rows: 1, cols: 10, paramName: "value")
3536
{
@@ -50,7 +51,7 @@ class SettingsController {
5051
* autocomplete box with choices.
5152
*/
5253
def settingsAsJSON = {
53-
def jsonList = settingsService.getSettingsDataSet().rows().findAll{it.key.startsWith(params.query)}
54+
def jsonList = UserSetting.findAllByKeyIlikeOrValueIlike("%${params.query}%", "%${params.query}%").collect{["KEY": it.key]}
5455
def jsonResult = [
5556
settings: jsonList
5657
]

‎OpenLabFrontend/grails-app/controllers/org/openlab/settings/UsersettingsController.groovy‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,25 @@ class UsersettingsController {
5656
else render "Could not change language setting."
5757

5858
}
59+
60+
def collapseLeftColumn(){
61+
settingsService.setUserSetting(key: "left.column.collapse", value: "true")
62+
render "ok"
63+
}
64+
65+
def collapseRightColumn(){
66+
settingsService.setUserSetting(key: "right.column.collapse", value: "true")
67+
render "ok"
68+
}
69+
70+
def expandLeftColumn(){
71+
settingsService.setUserSetting(key: "left.column.collapse", value: "false")
72+
render "ok"
73+
}
74+
75+
def expandRightColumn(){
76+
settingsService.setUserSetting(key: "right.column.collapse", value: "false")
77+
render "ok"
78+
}
79+
5980
}

‎OpenLabFrontend/grails-app/taglib/org/openlab/taglib/AddinsTagLib.groovy‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.openlab.taglib;
22

33
import org.openlab.genetracker.*;
44

5-
class AddinsTagLib {
5+
class AddinsTagLib {
66

77
def settingsService
88
def moduleHandlerService
@@ -11,7 +11,9 @@ class AddinsTagLib {
1111

1212
def layoutAddins = { attrs, body ->
1313
out << "<table style='width: 250px; border: none;'>"
14-
for(int i = 1; i <= Integer.valueOf(attrs.numberOfViews); i++)
14+
def numberOfViews = settingsService.getUserSetting(key: "addins.number")
15+
16+
for(int i = 1; i <= Integer.valueOf(numberOfViews); i++)
1517
{
1618
out << "<tr><td>" + richui.portletView(id:"${i}", slotStyle:'width: 250px; height: 200px;', playerStyle:'width: 250px; height: 200px;'){contentAtPos(slot:i);}
1719
out << "</td></tr>"
@@ -48,4 +50,4 @@ class AddinsTagLib {
4850
out << "empty slot"
4951
}
5052
}
51-
}
53+
}

‎OpenLabFrontend/grails-app/taglib/org/openlab/taglib/UsersTagLib.groovy‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.openlab.security.*;
55
class UsersTagLib {
66

77
def springSecurityService
8+
def settingsService
89

910
def listUsers = {
1011
User.list()
@@ -16,4 +17,22 @@ class UsersTagLib {
1617

1718
User.findByUsername(userName)
1819
}
20+
21+
def leftCollapsed = {
22+
if(settingsService.exists(key: "left.column.collapse")) {
23+
println settingsService.getUserSetting(key: "left.column.collapse")
24+
out << settingsService.getUserSetting(key: "left.column.collapse")
25+
}
26+
else{
27+
out << false
28+
};
29+
}
30+
31+
def rightCollapsed = {
32+
settingsService.getUserSetting(key: "right.column.collapse")
33+
}
34+
35+
def userSetting = { attrs, body ->
36+
out << body() << settingsService.getUserSetting(key: attrs.key)
37+
}
1938
}

‎OpenLabFrontend/grails-app/views/layouts/main.gsp‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,9 @@
8181
<!-- RIGHT: Addins -->
8282
<sec:ifLoggedIn>
8383
<div id='right1' align="center">
84-
<richui:portlet views='[1, 2, 3, 4, 5]' controller="addin" action="swapPositions" readOnly='true'>
84+
<richui:portlet views='[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]' controller="addin" action="swapPositions" readOnly='true'>
8585
<!-- Taglib providing addins -->
86-
<addin:layoutAddins controller="${session.bodyController ? params.bodyController : params.controller}"
87-
numberOfViews="${numberOfAddins ? numberOfAddins : 4}"/>
86+
<addin:layoutAddins controller="${session.bodyController ? params.bodyController : params.controller}"/>
8887
</richui:portlet>
8988
</div>
9089

@@ -109,14 +108,42 @@
109108
var layout = new YAHOO.widget.Layout({
110109
units:[
111110
{ position:'top', height:100, body:'top1', zIndex:1, scroll:null },
112-
{ position:'right', header:'Addins', width:300, resize:false, collapse:true, scroll:true, body:'right1', animate:true, gutter:'5' },
111+
{ position:'right', header:'Addins', width:300, resize:false, collapse: true, scroll:true, body:'right1', animate:true, gutter:'5' },
113112
{ position:'bottom', height:28, body:'bottom1' },
114113
{ position:'left', header:'Project Tree', width:200, body:'left1', gutter:'5', resize:true, scroll:true, animate:true, collapse:true},
115114
{ position:'center', body:'center1', gutter:'5 0', scroll:true }
116115
]
117116
});
118117

119118
layout.render();
119+
120+
var right = layout.getUnitByPosition('right');
121+
var left = layout.getUnitByPosition('left');
122+
if(${g.userSetting(key:"left.column.collapse")?:false})
123+
{
124+
left.collapse();
125+
}
126+
127+
if(${g.userSetting(key:"right.column.collapse")?:false})
128+
{
129+
right.collapse();
130+
}
131+
132+
left.on('collapse', function() {
133+
${remoteFunction(controller: 'usersettings', action: 'collapseLeftColumn')}
134+
});
135+
136+
left.on('expand', function() {
137+
${remoteFunction(controller: 'usersettings', action: 'expandLeftColumn')}
138+
});
139+
140+
right.on('collapse', function() {
141+
${remoteFunction(controller: 'usersettings', action: 'collapseRightColumn')}
142+
});
143+
144+
left.on('expand', function() {
145+
${remoteFunction(controller: 'usersettings', action: 'expandRightColumn')}
146+
});
120147
});
121148

122149
</r:script>

‎OpenLabFrontend/grails-app/views/settings/list.gsp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
idField="KEY"
2727
controller="settings"
2828
action="settingsAsJSON"
29-
/></td><td><div id="showResult">&nbsp;<br></br></div></td></tr></table>
29+
/></td><td><div id="showResult">&nbsp;</div></td></tr></table>
3030
</div>
3131
<div>
32-
<g:form name="addSetting" action="add">
32+
<g:formRemote onSuccess="alert('setting added');" name="addSetting" url="${[action:'add']}">
3333
<table>
3434
<tr>
3535
<th colspan=2>Add new Setting</th>
@@ -42,7 +42,7 @@
4242
<div class="buttons">
4343
<span class="button"><g:actionSubmit class="create" action="add" value="Add"/></span>
4444
</div>
45-
</g:form>
45+
</g:formRemote>
4646
</div>
4747
</div>
4848

@@ -79,12 +79,12 @@
7979
</div>
8080

8181
</div>
82-
<script>
82+
<r:script>
8383
YAHOO.util.Event.onDOMReady(function() {
8484
GRAILSUI.settingsAutoComplete.itemSelectEvent.subscribe(function(type, args) {
85-
${remoteFunction(action:"updateShowResult", params: '\'key=\'+GRAILSUI.settingsAutoComplete.getInputEl().getValue()', update: [success:'showResult',failure:'showResult'])};
85+
${remoteFunction(action:"updateShowResult", params: '\'key=\'+GRAILSUI.settingsAutoComplete.getInputEl().getValue()', update: [success:'showResult',failure:'showResult'])};
8686
});
8787
});
88-
</script>
88+
</r:script>
8989
</body>
9090
</html>

0 commit comments

Comments
 (0)