summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy8
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy7
-rw-r--r--idrop-web/grails-app/views/browse/dataObjectInfo.gsp3
-rw-r--r--idrop-web/grails-app/views/browse/index.gsp4
-rw-r--r--idrop-web/pom.xml8
-rw-r--r--idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy3
-rw-r--r--idrop-web/web-app/css/main.css16
-rw-r--r--pom.xml2
8 files changed, 34 insertions, 17 deletions
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index 19b3514..7a87e96 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -5,7 +5,7 @@ grails.project.test.reports.dir = "target/test-reports"
grails.project.dependency.resolution = {
// inherit Grails' default dependencies
inherits("global") {
- // uncomment to disable ehcache
+ // uncomment to disable ehcace
excludes 'ehcache'
}
log "warn" // LOG level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
@@ -30,6 +30,9 @@ grails.project.dependency.resolution = {
test 'org.mockito:mockito-all:1.8.1'
compile 'org.irods.jargon:jargon-core:2.4.1-SNAPSHOT'
compile 'org.irods.jargon:jargon-security:2.4.1-SNAPSHOT'
+ compile ('org.irods.jargon:jargon-user-tagging:2.4.1-SNAPSHOT') {
+ exclude 'junit'
+ }
compile 'org.springframework.security:spring-security-core:3.0.5.RELEASE'
compile 'org.springframework.security:spring-security-web:3.0.5.RELEASE'
compile 'org.springframework.security:spring-security-config:3.0.5.RELEASE'
@@ -37,7 +40,6 @@ grails.project.dependency.resolution = {
compile 'javax.servlet:servlet-api:2.5'
compile( group: 'log4j', name: 'log4j', version: '1.2.16', export: false )
- //compile 'log4j:log4j:1.2.16'
- // runtime 'mysql:mysql-connector-java:5.1.5'
+
}
}
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
index 817cfb2..5b58f1d 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
@@ -6,6 +6,8 @@ import org.irods.jargon.core.connection.*
import org.irods.jargon.core.exception.*
import org.irods.jargon.core.pub.*
import org.irods.jargon.core.pub.domain.DataObject
+import org.irods.jargon.usertagging.FreeTaggingService
+import org.irods.jargon.usertagging.FreeTaggingServiceImpl
import org.springframework.security.core.context.SecurityContextHolder
@@ -108,9 +110,12 @@ class BrowseController {
log.info "is this a data object? ${isDataObject}"
+ FreeTaggingService freeTaggingService = FreeTaggingServiceImpl.instance(irodsAccessObjectFactory, irodsAccount)
if (isDataObject) {
+ log.info("getting free tags for data object")
+ def freeTags = freeTaggingService.getTagsForDataObjectInFreeTagForm(absPath)
log.info("rendering as data object: ${retObj}")
- render(view:"dataObjectInfo", model:[dataObject:retObj])
+ render(view:"dataObjectInfo", model:[dataObject:retObj,tags:freeTags])
}
}
diff --git a/idrop-web/grails-app/views/browse/dataObjectInfo.gsp b/idrop-web/grails-app/views/browse/dataObjectInfo.gsp
index bf895f5..ad9fa3b 100644
--- a/idrop-web/grails-app/views/browse/dataObjectInfo.gsp
+++ b/idrop-web/grails-app/views/browse/dataObjectInfo.gsp
@@ -16,6 +16,9 @@ Collection:</label> <g:textField name="collectionName"
<label for="checksum">Checksum:</label> <g:textField name="checksum"
value="${dataObject.checksum}" readonly="true" /> <br />
+<label for="tags">Tags:</label> <g:textField name="tags"
+ value="${tags.spaceDelimitedTagsForDomain}" /> <br />
+
</fieldset> \ No newline at end of file
diff --git a/idrop-web/grails-app/views/browse/index.gsp b/idrop-web/grails-app/views/browse/index.gsp
index 7b0a3ef..a80601a 100644
--- a/idrop-web/grails-app/views/browse/index.gsp
+++ b/idrop-web/grails-app/views/browse/index.gsp
@@ -9,9 +9,9 @@ $(function() {
<div id="browser" class="wrapper">
<div id="dataTreeView"
- style="float: left; position: relative; width: auto;"><!-- no empty divs -->
+ style="float: left; position: relative; width: auto; display:inline-block; overflow:auto;"><!-- no empty divs -->
<div id="dataTreeDiv" class="colLeft"><!-- no empty divs --></div>
-<div id="infoDiv" class="colRight roundedContainer"><!-- no empty divs --></div>
+<div id="infoDiv" class="colRight roundedContainer"><h2>Select a directory or file to see info and tags</h2></div>
</div>
</div> \ No newline at end of file
diff --git a/idrop-web/pom.xml b/idrop-web/pom.xml
index df074f3..662c834 100644
--- a/idrop-web/pom.xml
+++ b/idrop-web/pom.xml
@@ -16,18 +16,18 @@
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-bootstrap</artifactId>
- <version>1.3.2</version>
+ <version>1.3.6</version>
</dependency>
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-crud</artifactId>
- <version>1.3.2</version>
+ <version>1.3.6</version>
</dependency>
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-gorm</artifactId>
- <version>1.3.2</version>
+ <version>1.3.6</version>
</dependency>
<!-- Needed in the case of AOP usage -->
@@ -151,7 +151,7 @@
<plugin>
<groupId>org.grails</groupId>
<artifactId>grails-maven-plugin</artifactId>
- <version>1.3.2</version>
+ <version>1.3.6</version>
<extensions>true</extensions>
<executions>
<execution>
diff --git a/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy b/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy
index cfabb2f..0a01f66 100644
--- a/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy
+++ b/idrop-web/test/unit/org/irods/mydrop/controller/BrowseControllerTests.groovy
@@ -83,7 +83,7 @@ class BrowseControllerTests extends ControllerUnitTestCase {
controller.irodsAccount = irodsAccount
controller.params.absPath = testPath
controller.fileInfo()
-
+ // FIXME: add factory for free tagging service, inject into controller to allow mocking of free tagging service
def mav = controller.modelAndView
def name = mav.viewName
@@ -93,7 +93,6 @@ class BrowseControllerTests extends ControllerUnitTestCase {
assertNotNull("null data object", dataObj)
assertEquals("did not find expected path", testPath, dataObj.dataName)
-
}
}
diff --git a/idrop-web/web-app/css/main.css b/idrop-web/web-app/css/main.css
index 2dc8d36..745e584 100644
--- a/idrop-web/web-app/css/main.css
+++ b/idrop-web/web-app/css/main.css
@@ -63,19 +63,27 @@ div.scroll {
padding: 8px;
}
+div#tabs {
+ overflow: auto;
+ width: 100%;
+ display: inline-block;
+ }
+
.wrapper {
text-align: left;
margin: 0px auto;
padding: 0px;
border: 0;
- width: 800px;
+ width: 850px;
display: inline-block;
+ overflow: auto;
+
}
.colRight {
position: relative;
float: right;
- width: 250px;
+ width: 350px;
display: block;
overflow: auto;
}
@@ -83,7 +91,7 @@ div.scroll {
.colLeft {
position: relative;
float: left;
- width: 500px;
+ width: 450px;
display: block;
overflow: auto;
}
@@ -500,7 +508,7 @@ th.desc a {
#verticalForm input {
display: block;
- width: 15em;
+ width: 20em;
}
#verticalForm label {
diff --git a/pom.xml b/pom.xml
index 5359147..561cc18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,7 +196,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.8</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>