Merge pull request #2903 from SaptakS/sponsor-fix

Create Sponsor Fixes
fossasia · Jan 10, 2017 · 85e0fdd · 85e0fdd
2 parents 5113dc5 + 0d67131
commit 85e0fdd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/app/api/helpers/custom_fields.py b/app/api/helpers/custom_fields.py
@@ -26,12 +26,6 @@ def format(self, value):
         format the text in database for output
         works only for GET requests
         """
-        if not self.validate(value):
-            print 'Validation of field with value \"%s\" (%s) failed' % (
-                value, str(self.__class__.__name__))
-            # raise MarshallingError
-            # disabling for development purposes as the server crashes when
-            # exception is raised. can be enabled when the project is mature
         if self.__schema_type__ == 'string':
             return unicode(value)
         else:

diff --git a/app/helpers/wizard/sponsors.py b/app/helpers/wizard/sponsors.py
@@ -16,8 +16,8 @@ def get_sponsors_json(event_id_or_sponsors):
     data = []
     for sponsor in sponsors:
         data.append(sponsor.serialize)
-
-    return data
+ 
+    return sorted(data, key=lambda x: x['id'])
 
 
 def save_sponsors_from_json(json, event_id=None):
@@ -43,12 +43,11 @@ def save_sponsors_from_json(json, event_id=None):
             item.description = sponsor['description']
 
             save_to_db(item)
-
             if item.logo != sponsor['logo']:
                 if sponsor['logo'] and sponsor['logo'] != '':
                     item.logo = save_event_image(sponsor['logo'], UPLOAD_PATHS['sponsors']['logo'].format(
                         event_id=int(event.id), id=int(item.id)
-                    ))
+                    ), remove_after_upload=False)
                 else:
                     item.logo = ''
 

diff --git a/app/static/js/admin/event/wizard/vue-app.js b/app/static/js/admin/event/wizard/vue-app.js
@@ -390,10 +390,11 @@ function save(stepToSave, state, callback) {
         state: state
     };
 
+    /* Commented out for now until better condition is found
     if (!_.isUndefined(app.event.id) && !_.isNull(app.event.id) && _.isNumber(app.event.id) && !_.isUndefined(callback)) {
         callback();
         callback = null;
-    }
+    }*/
 
     switch (stepToSave) {
         case 'event':
@@ -415,9 +416,10 @@ function save(stepToSave, state, callback) {
             makePost('all', data, callback);
             break;
         default:
+            /* Commented out for now until better condition is found
             if (!_.isUndefined(callback) && !_.isNull(callback)) {
                 callback();
-            }
+            }*/
     }
 }
 

diff --git a/app/templates/gentelella/admin/event/wizard/components/image-upload.html b/app/templates/gentelella/admin/event/wizard/components/image-upload.html
@@ -28,7 +28,7 @@ <h3>{{ '{{ title }}' }} {{ _("is uploading") }}</h3>
         </div>
         <div class="item form-group" v-if="internalImageUrl && internalImageUrl != ''">
             <label>{{ '{{ title }}' }}</label><br>
-            <img v-bind:src="internalImageUrl" style="max-width: 450px;"><br><br>
+            <img v-bind:src="internalImageUrl" style="max-width: 300px; max-height: 300px"><br><br>
             <button type="button" class="btn btn-sm btn-default" v-on:click="internalImageUrl = ''">
                 <i class="fa fa-trash-o" aria-hidden="true"></i>
                 {{ _("Remove") }}