svn commit: r1628516 - in /vcl/trunk/web: .ht-inc/image.php js/resources/image.js

[jfthomps]

Author: jfthomps
Date: Tue Sep 30 19:13:40 2014
New Revision: 1628516

URL: http://svn.apache.org/r1628516
Log:
VCL-776 - rework resource code to have a base class for all resources and 
inheriting classes for each resource type

image.php: modified AJdeleteRevisions: added DISTINCT to select so each in use 
revision is only reported once

image.js:
-modified inlineEditResourceCB and resetEditResource: set contents of 
addeditdlgerrmsg to empty string
-modified deleteRevisionsCB: changed 'deletemsg' to 'addeditdlgerrmsg'

Modified:
    vcl/trunk/web/.ht-inc/image.php
    vcl/trunk/web/js/resources/image.js

Modified: vcl/trunk/web/.ht-inc/image.php
URL: 
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1628516&r1=1628515&r2=1628516&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Tue Sep 30 19:13:40 2014
@@ -1908,7 +1908,7 @@ class Image extends Resource {
                                return;
                        }
                }
-               $query = "SELECT ir.revision "
+               $query = "SELECT DISTINCT ir.revision "
                       . "FROM request rq, "
                       .      "reservation rs, "
                       .      "imagerevision ir "

Modified: vcl/trunk/web/js/resources/image.js
URL: 
http://svn.apache.org/viewvc/vcl/trunk/web/js/resources/image.js?rev=1628516&r1=1628515&r2=1628516&view=diff
==============================================================================
--- vcl/trunk/web/js/resources/image.js (original)
+++ vcl/trunk/web/js/resources/image.js Tue Sep 30 19:13:40 2014
@@ -64,6 +64,7 @@ function inlineEditResourceCB(data, ioAr
                dijit.byId('connectmethodttd').set('href', 
data.items.data.connectmethodurl);
                dijit.byId('subimagedlg').set('href', 
data.items.data.subimageurl);
                dojo.byId('revisiondiv').innerHTML = 
data.items.data.revisionHTML;
+               dojo.byId('addeditdlgerrmsg').innerHTML = '';
                AJdojoCreate('revisiondiv');
                dijit.byId('addeditdlg').show();
        }
@@ -100,6 +101,7 @@ function resetEditResource() {
        if(dijit.byId('advancedoptions').open)
                dijit.byId('advancedoptions').toggle();
        dojo.byId('connectmethodlist').innerHTML = '';
+       dojo.byId('addeditdlgerrmsg').innerHTML = '';
 }
 
 function saveResource() {
@@ -535,7 +537,7 @@ function deleteRevisions(cont, idlist) {
 
 function deleteRevisionsCB(data, ioArgs) {
        if('status' in data.items && data.items.status == 'error') {
-               dojo.byId('deletemsg').innerHTML = data.items.msg;
+               dojo.byId('addeditdlgerrmsg').innerHTML = data.items.msg;
                return;
        }
        dijit.registry.filter(function(widget, index){return 
widget.id.match(/^comments/);}).forEach(function(widget) {widget.destroy();});