Changeset 358 for trunk

Timestamp:

Feb 16, 2010, 9:01:07 AM (15 years ago)

Author:

gav

Message:

Added an application log view.
Reduced log file size and added CSS and JavaScript? to suite.

Location:

trunk

Files:

• grails-app/conf/Config.groovy (modified) (1 diff)
• grails-app/controllers/AppCoreController.groovy (modified) (2 diffs)
• grails-app/controllers/SectionDetailedController.groovy (modified) (2 diffs)
• grails-app/views/appCore/appAdmin.gsp (modified) (1 diff)
• grails-app/views/appCore/appLog.gsp (added)
• web-app/css/main.css (modified) (1 diff)
• web-app/js/jsUtil.js (modified) (1 diff)

trunk/grails-app/conf/Config.groovy

@@ -59 +59 @@
         rollingFile name:"appLog",
                         file:"${logDirectory}/${appName}.log".toString(),
-                        maxFileSize:'1MB',
+                        maxFileSize:'300kB',
                         maxBackupIndex:0,
                         layout:pattern(conversionPattern: '%d{[EEE, dd-MMM-yyyy @ HH:mm:ss.SSS]} [%t] %-5p %c %x - %m%n')

trunk/grails-app/controllers/AppCoreController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+import org.codehaus.groovy.grails.commons.*
 
 /**
@@ -193 +194 @@
     }
 
+    /**
+    * Render the application log file.
+    */
+    @Secured(['ROLE_AppAdmin'])
+    def appLog = {
+        def file = new File(ConfigurationHolder.config.log4j.appenders.appLog.file)
+
+        // Success.
+        [log: file.text]
+    }
+
 } // end of class.

trunk/grails-app/controllers/SectionDetailedController.groovy

@@ -3 +3 @@
 @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager'])
 class SectionDetailedController extends BaseController {
+
+    def sectionService
 
     // the delete, save and update actions only accept POST requests
@@ -29 +31 @@
     @Secured(['ROLE_AppAdmin'])
     def delete = {
-        def sectionInstance = Section.get( params.id )
-        if(sectionInstance) {
-            try {
-                sectionInstance.delete(flush:true)
-                flash.message = "Section ${params.id} deleted"
-                redirect(action:list)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "Section ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
+        def result = sectionService.delete(params)
+
+        if(!result.error) {
+            flash.message = g.message(code: "default.delete.success", args: ["Section", params.id])
+            redirect(action:list)
+            return
         }
-        else {
-            flash.message = "Section not found with id ${params.id}"
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+
+        if(result.error.code == "default.not.found") {
             redirect(action:list)
+            return
         }
+
+        redirect(action:show, id: params.id)
     }
 

trunk/grails-app/views/appCore/appAdmin.gsp

@@ -17 +17 @@
                 <table>
                     <tbody>
+
+                        <tr class="prop">
+                            <td valign="top" class="name">
+                                <label>Log:</label>
+                            </td>
+                            <td valign="top" class="value">
+                                <g:link action="appLog">View</g:link> - The application log file.
+                            </td>
+                        </tr>
 
                         <tr class="prop">

trunk/web-app/css/main.css

@@ -55 +55 @@
     float: left;
     /*border: 1px solid #ccc;*/
+}
+
+#log {
+    width: 920px;
+    height: auto;
 }
 

trunk/web-app/js/jsUtil.js

@@ -35 +35 @@
     }
 }
+
+function textAreaScrollBottom(id) {
+    $(id).scrollTop = $(id).scrollHeight;
+}
+
+function focusUtil(id) {
+    $(id).focus();
+}